diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py b/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py
rename to common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service b/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service
rename to common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power.bb b/common/recipes-phosphor/chassis/obmc-button-power.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power.bb
rename to common/recipes-phosphor/chassis/obmc-button-power.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power/org.openbmc.buttons.Power@.service
rename to common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset.bb b/common/recipes-phosphor/chassis/obmc-button-reset.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset.bb
rename to common/recipes-phosphor/chassis/obmc-button-reset.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
rename to common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis.bb b/common/recipes-phosphor/chassis/obmc-control-chassis.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis.bb
rename to common/recipes-phosphor/chassis/obmc-control-chassis.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
rename to common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop.bb b/common/recipes-phosphor/chassis/obmc-hostcheckstop.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop.bb
rename to common/recipes-phosphor/chassis/obmc-hostcheckstop.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service b/common/recipes-phosphor/chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service
rename to common/recipes-phosphor/chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory.bb b/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory.bb
rename to common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
rename to common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/org.openbmc.Inventory.service b/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
rename to common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power.bb b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power.bb
rename to common/recipes-phosphor/chassis/obmc-op-control-power.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/obmc/power_control b/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/obmc/power_control
rename to common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-start@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-start@.service
rename to common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-stop@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-stop@.service
rename to common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-off@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-off@.service
rename to common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-on@.service
rename to common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/org.openbmc.control.Power@.service
rename to common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect.bb b/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect.bb
rename to common/recipes-phosphor/chassis/obmc-pcie-detect.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect/pcie-slot-detect@.service b/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect/pcie-slot-detect@.service
rename to common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb b/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
rename to common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog.bb b/common/recipes-phosphor/chassis/obmc-watchdog.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog.bb
rename to common/recipes-phosphor/chassis/obmc-watchdog.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-start-watchdog@.service b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-start-watchdog@.service
rename to common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-stop-watchdog@.service b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-stop-watchdog@.service
rename to common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service b/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
rename to common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
diff --git a/common/recipes-phosphor/obmc-console/obmc-console.bb b/common/recipes-phosphor/console/obmc-console.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-console/obmc-console.bb
rename to common/recipes-phosphor/console/obmc-console.bb
diff --git a/common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh.socket b/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
similarity index 100%
rename from common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh.socket
rename to common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
diff --git a/common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh@.service b/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh@.service
rename to common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
diff --git a/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf b/common/recipes-phosphor/console/obmc-console/obmc-console.conf
similarity index 100%
rename from common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf
rename to common/recipes-phosphor/console/obmc-console/obmc-console.conf
diff --git a/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service b/common/recipes-phosphor/console/obmc-console/obmc-console.service
similarity index 100%
rename from common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service
rename to common/recipes-phosphor/console/obmc-console/obmc-console.service
diff --git a/common/recipes-phosphor/obmc-phosphor-devtools/obmc-pydevtools.bb b/common/recipes-phosphor/devtools/obmc-pydevtools.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-devtools/obmc-pydevtools.bb
rename to common/recipes-phosphor/devtools/obmc-pydevtools.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-event/files/eventd.conf b/common/recipes-phosphor/events/files/eventd.conf
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-event/files/eventd.conf
rename to common/recipes-phosphor/events/files/eventd.conf
diff --git a/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service b/common/recipes-phosphor/events/files/obmc-phosphor-event.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service
rename to common/recipes-phosphor/events/files/obmc-phosphor-event.service
diff --git a/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/common/recipes-phosphor/events/obmc-phosphor-event.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
rename to common/recipes-phosphor/events/obmc-phosphor-event.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py b/common/recipes-phosphor/examples/files/obmc-phosphor-example-pydbus.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py
rename to common/recipes-phosphor/examples/files/obmc-phosphor-example-pydbus.py
diff --git a/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.conf b/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.conf
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.conf
rename to common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.conf
diff --git a/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service b/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service
rename to common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service
diff --git a/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py b/common/recipes-phosphor/examples/files/pyclient-sample.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py
rename to common/recipes-phosphor/examples/files/pyclient-sample.py
diff --git a/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb b/common/recipes-phosphor/examples/obmc-phosphor-example-pydbus.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
rename to common/recipes-phosphor/examples/obmc-phosphor-example-pydbus.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
rename to common/recipes-phosphor/examples/obmc-phosphor-example-sdbus.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile b/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/Makefile
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile
rename to common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/Makefile
diff --git a/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c b/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.c
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c
rename to common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.c
diff --git a/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf b/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.conf
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf
rename to common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.conf
diff --git a/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service b/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service
rename to common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/files/Makefile b/common/recipes-phosphor/fans/files/Makefile
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/files/Makefile
rename to common/recipes-phosphor/fans/files/Makefile
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c b/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c
rename to common/recipes-phosphor/fans/files/obmc-phosphor-fand.c
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service b/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service
rename to common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan.bb b/common/recipes-phosphor/fans/obmc-control-fan.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan.bb
rename to common/recipes-phosphor/fans/obmc-control-fan.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/obmc-max-fans.service b/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/obmc-max-fans.service
rename to common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/org.openbmc.control.Fans.service b/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/org.openbmc.control.Fans.service
rename to common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
diff --git a/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb b/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
rename to common/recipes-phosphor/fans/obmc-phosphor-fand.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py b/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py
rename to common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service b/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service
rename to common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios.bb b/common/recipes-phosphor/flash/obmc-flash-bios.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios.bb
rename to common/recipes-phosphor/flash/obmc-flash-bios.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/obmc-flash-init.service b/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/obmc-flash-init.service
rename to common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/org.openbmc.control.Flash.service b/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/org.openbmc.control.Flash.service
rename to common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc.bb b/common/recipes-phosphor/flash/obmc-flash-bmc.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc.bb
rename to common/recipes-phosphor/flash/obmc-flash-bmc.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
rename to common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download.bb b/common/recipes-phosphor/flash/obmc-mgr-download.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download.bb
rename to common/recipes-phosphor/flash/obmc-mgr-download.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download/org.openbmc.managers.Download.service b/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download/org.openbmc.managers.Download.service
rename to common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-op-flasher.bb b/common/recipes-phosphor/flash/obmc-op-flasher.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-op-flasher.bb
rename to common/recipes-phosphor/flash/obmc-op-flasher.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb b/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
rename to common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host.bb b/common/recipes-phosphor/hosts/obmc-op-control-host.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host.bb
rename to common/recipes-phosphor/hosts/obmc-op-control-host.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/op-start-host@.service b/common/recipes-phosphor/hosts/obmc-op-control-host/op-start-host@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/op-start-host@.service
rename to common/recipes-phosphor/hosts/obmc-op-control-host/op-start-host@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/org.openbmc.control.Host@.service b/common/recipes-phosphor/hosts/obmc-op-control-host/org.openbmc.control.Host@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/org.openbmc.control.Host@.service
rename to common/recipes-phosphor/hosts/obmc-op-control-host/org.openbmc.control.Host@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/common/recipes-phosphor/initfs/files/obmc-init.sh
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
rename to common/recipes-phosphor/initfs/files/obmc-init.sh
diff --git a/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh b/common/recipes-phosphor/initfs/files/obmc-shutdown.sh
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
rename to common/recipes-phosphor/initfs/files/obmc-shutdown.sh
diff --git a/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh b/common/recipes-phosphor/initfs/files/obmc-update.sh
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
rename to common/recipes-phosphor/initfs/files/obmc-update.sh
diff --git a/common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist b/common/recipes-phosphor/initfs/files/whitelist
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist
rename to common/recipes-phosphor/initfs/files/whitelist
diff --git a/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb b/common/recipes-phosphor/initfs/obmc-phosphor-initfs.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb
rename to common/recipes-phosphor/initfs/obmc-phosphor-initfs.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led.bb b/common/recipes-phosphor/leds/obmc-control-led.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-led/obmc-control-led.bb
rename to common/recipes-phosphor/leds/obmc-control-led.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-start@.service b/common/recipes-phosphor/leds/obmc-control-led/obmc-led-start@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-start@.service
rename to common/recipes-phosphor/leds/obmc-control-led/obmc-led-start@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-stop@.service b/common/recipes-phosphor/leds/obmc-control-led/obmc-led-stop@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-stop@.service
rename to common/recipes-phosphor/leds/obmc-control-led/obmc-led-stop@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/org.openbmc.control.led.service b/common/recipes-phosphor/leds/obmc-control-led/org.openbmc.control.led.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/org.openbmc.control.led.service
rename to common/recipes-phosphor/leds/obmc-control-led/org.openbmc.control.led.service
diff --git a/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py b/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py
rename to common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py
diff --git a/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service b/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service
rename to common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service
diff --git a/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb b/common/recipes-phosphor/policy/obmc-phosphor-policyd.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
rename to common/recipes-phosphor/policy/obmc-phosphor-policyd.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py b/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py
rename to common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service b/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service
rename to common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb b/common/recipes-phosphor/sensors/obmc-hwmon.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb
rename to common/recipes-phosphor/sensors/obmc-hwmon.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon/obmc-hwmon.service b/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon/obmc-hwmon.service
rename to common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb b/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb
rename to common/recipes-phosphor/sensors/obmc-mgr-sensor.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor/org.openbmc.Sensors.service b/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor/org.openbmc.Sensors.service
rename to common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb b/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
rename to common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-libobmc/obmc-libobmc-intf.bb b/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-libobmc/obmc-libobmc-intf.bb
rename to common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py b/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py
rename to common/recipes-phosphor/system/files/obmc-phosphor-sysd.py
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service b/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service
rename to common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc.bb b/common/recipes-phosphor/system/obmc-control-bmc.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc.bb
rename to common/recipes-phosphor/system/obmc-control-bmc.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc/org.openbmc.control.Bmc@.service b/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc/org.openbmc.control.Bmc@.service
rename to common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state.bb b/common/recipes-phosphor/system/obmc-mgr-state.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state.bb
rename to common/recipes-phosphor/system/obmc-mgr-state.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.service b/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.service
rename to common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.target b/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.target
rename to common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system.bb b/common/recipes-phosphor/system/obmc-mgr-system.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system.bb
rename to common/recipes-phosphor/system/obmc-mgr-system.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/org.openbmc.managers.System.service b/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/org.openbmc.managers.System.service
rename to common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/startup-hacks.service b/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/startup-hacks.service
rename to common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service
diff --git a/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb b/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
rename to common/recipes-phosphor/system/obmc-phosphor-sysd.bb
diff --git a/common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service b/common/recipes-phosphor/users/files/obmc-phosphor-user.service
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service
rename to common/recipes-phosphor/users/files/obmc-phosphor-user.service
diff --git a/common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb b/common/recipes-phosphor/users/obmc-phosphor-user.bb
similarity index 100%
rename from common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb
rename to common/recipes-phosphor/users/obmc-phosphor-user.bb