Drop obmc-phosphor- prefix from recipe collections

Given that these are already in the recipes-phosphor
directory this seemed redundant.

Change-Id: I48a1ab79e0eda88fc5e6af88f198ca3941e829b8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

100 files changed, 0 insertions, 0 deletions

diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
index a68f2e511..a68f2e511 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.py
+++ b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
index adb47d18f..adb47d18f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/files/obmc-phosphor-chassisd.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb
index db995e100..db995e100 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
index 2eb36d66d..2eb36d66d 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-power/org.openbmc.buttons.Power@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb
index 802e49909..802e49909 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
index 5b060e470..5b060e470 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb
index 157d4169b..157d4169b 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
index 1620fe14f..1620fe14f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-hostcheckstop.bb
index c4b36165e..c4b36165e 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-hostcheckstop.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service
index 3b169c57f..3b169c57f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-hostcheckstop/org.openbmc.control.Checkstop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
index 73a598c15..73a598c15 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
index 33b1166c0..33b1166c0 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/org.openbmc.Inventory.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
index 0f835a618..0f835a618 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/org.openbmc.Inventory.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index a13c6328b..a13c6328b 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/obmc/power_control b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
index 8db889034..8db889034 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/obmc/power_control
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index cae414f8a..cae414f8a 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index f370a3cd9..f370a3cd9 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 431514095..431514095 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index 16b83c0cb..16b83c0cb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
index 4b981830c..4b981830c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-op-control-power/org.openbmc.control.Power@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
index 7af067ffb..7af067ffb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
index 532d5e9bf..532d5e9bf 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-pcie-detect/pcie-slot-detect@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
index d7a8ed998..d7a8ed998 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb
index 558690303..558690303 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
index 7178d93ab..7178d93ab 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-start-watchdog@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-stop-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
index 2b086cf2c..2b086cf2c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/obmc-stop-watchdog@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
index 2429c642f..2429c642f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/org.openbmc.watchdog.Host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console.bb b/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb
index 131c6c71d..131c6c71d 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console.bb
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
index 3fbfd99d7..3fbfd99d7 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh.socket
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
index 74d5a7a32..74d5a7a32 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console-ssh@.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf
index d42caa935..d42caa935 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
index 2f540ea79..2f540ea79 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-devtools/obmc-pydevtools.bb b/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb
index 296a3992f..296a3992f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-devtools/obmc-pydevtools.bb
+++ b/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/eventd.conf b/meta-phosphor/common/recipes-phosphor/events/files/eventd.conf
index b50dfbcea..b50dfbcea 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/eventd.conf
+++ b/meta-phosphor/common/recipes-phosphor/events/files/eventd.conf
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service b/meta-phosphor/common/recipes-phosphor/events/files/obmc-phosphor-event.service
index a93fce054..a93fce054 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service
+++ b/meta-phosphor/common/recipes-phosphor/events/files/obmc-phosphor-event.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/events/obmc-phosphor-event.bb
index bba2a6498..bba2a6498 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
+++ b/meta-phosphor/common/recipes-phosphor/events/obmc-phosphor-event.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py b/meta-phosphor/common/recipes-phosphor/examples/files/obmc-phosphor-example-pydbus.py
index 1f4ce90bb..1f4ce90bb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/obmc-phosphor-example-pydbus.py
+++ b/meta-phosphor/common/recipes-phosphor/examples/files/obmc-phosphor-example-pydbus.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.conf b/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.conf
index 6c4a71314..6c4a71314 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.conf
+++ b/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.conf
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service b/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service
index 27d9bfe12..27d9bfe12 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/org.openbmc.examples.PythonService.service
+++ b/meta-phosphor/common/recipes-phosphor/examples/files/org.openbmc.examples.PythonService.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py b/meta-phosphor/common/recipes-phosphor/examples/files/pyclient-sample.py
index 138865db0..138865db0 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/files/pyclient-sample.py
+++ b/meta-phosphor/common/recipes-phosphor/examples/files/pyclient-sample.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-pydbus.bb
index a6c513dda..a6c513dda 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-pydbus.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus.bb
index a19b6848f..a19b6848f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/Makefile
index 0aaeb5341..0aaeb5341 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/Makefile
+++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/Makefile
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.c
index 769a2081f..769a2081f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/obmc-phosphor-example-sdbus.c
+++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.c
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.conf
index 86e2a53fa..86e2a53fa 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.conf
+++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.conf
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service
index 442e910fb..442e910fb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/files/org.openbmc.examples.SDBusService.service
+++ b/meta-phosphor/common/recipes-phosphor/examples/obmc-phosphor-example-sdbus/org.openbmc.examples.SDBusService.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/Makefile b/meta-phosphor/common/recipes-phosphor/fans/files/Makefile
index 10e3fa2ae..10e3fa2ae 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/Makefile
+++ b/meta-phosphor/common/recipes-phosphor/fans/files/Makefile
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c
index 558ba10bc..558ba10bc 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.c
+++ b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
index 6698e120d..6698e120d 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/files/obmc-phosphor-fand.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
index 256f9fc20..256f9fc20 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan.bb
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
index ad0db5cd3..ad0db5cd3 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/obmc-max-fans.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
index 9fead8fbe..9fead8fbe 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan/org.openbmc.control.Fans.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
index 8c937c6ed..8c937c6ed 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
index 5e5dd8f36..5e5dd8f36 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.py
+++ b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
index 1b1b892cb..1b1b892cb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/files/obmc-phosphor-flashd.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
index c425027bf..c425027bf 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
index 4893cd1cc..4893cd1cc 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/obmc-flash-init.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/org.openbmc.control.Flash.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
index fefd172f5..fefd172f5 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bios/org.openbmc.control.Flash.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb
index 5cf385513..5cf385513 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
index ddc8ec8ca..ddc8ec8ca 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb
index a608b0ab2..a608b0ab2 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download/org.openbmc.managers.Download.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
index e7bd28b7c..e7bd28b7c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-mgr-download/org.openbmc.managers.Download.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-op-flasher.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
index 99085002a..99085002a 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-op-flasher.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
index 6e4c04a25..6e4c04a25 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/hosts/obmc-op-control-host.bb
index dabc4a8a6..dabc4a8a6 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host.bb
+++ b/meta-phosphor/common/recipes-phosphor/hosts/obmc-op-control-host.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/hosts/obmc-op-control-host/op-start-host@.service
index 644515520..644515520 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/op-start-host@.service
+++ b/meta-phosphor/common/recipes-phosphor/hosts/obmc-op-control-host/op-start-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/org.openbmc.control.Host@.service b/meta-phosphor/common/recipes-phosphor/hosts/obmc-op-control-host/org.openbmc.control.Host@.service
index 59d0c3d9e..59d0c3d9e 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-host/obmc-op-control-host/org.openbmc.control.Host@.service
+++ b/meta-phosphor/common/recipes-phosphor/hosts/obmc-op-control-host/org.openbmc.control.Host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh
index 70af93d99..70af93d99 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh
+++ b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-shutdown.sh
index 8d5c6726c..8d5c6726c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
+++ b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-shutdown.sh
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-update.sh
index f0c41a74c..f0c41a74c 100755
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
+++ b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-update.sh
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist b/meta-phosphor/common/recipes-phosphor/initfs/files/whitelist
index 6b1297dcb..6b1297dcb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/whitelist
+++ b/meta-phosphor/common/recipes-phosphor/initfs/files/whitelist
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb b/meta-phosphor/common/recipes-phosphor/initfs/obmc-phosphor-initfs.bb
index f81e21dd1..f81e21dd1 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb
+++ b/meta-phosphor/common/recipes-phosphor/initfs/obmc-phosphor-initfs.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led.bb b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led.bb
index 292b9fd88..292b9fd88 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led.bb
+++ b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-start@.service b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led/obmc-led-start@.service
index a60107887..a60107887 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led/obmc-led-start@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-stop@.service b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led/obmc-led-stop@.service
index 81bdbecbc..81bdbecbc 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/obmc-led-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led/obmc-led-stop@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/org.openbmc.control.led.service b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led/org.openbmc.control.led.service
index 66139e34c..66139e34c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-led/obmc-control-led/org.openbmc.control.led.service
+++ b/meta-phosphor/common/recipes-phosphor/leds/obmc-control-led/org.openbmc.control.led.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py b/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py
index 48f19d46c..48f19d46c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.py
+++ b/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service b/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service
index 3c2b13833..3c2b13833 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/files/obmc-phosphor-policyd.service
+++ b/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb b/meta-phosphor/common/recipes-phosphor/policy/obmc-phosphor-policyd.bb
index 05471d52f..05471d52f 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb
+++ b/meta-phosphor/common/recipes-phosphor/policy/obmc-phosphor-policyd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py
index c9771acb4..c9771acb4 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.py
+++ b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service
index 247164feb..247164feb 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/files/obmc-phosphor-sensord.service
+++ b/meta-phosphor/common/recipes-phosphor/sensors/files/obmc-phosphor-sensord.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon.bb
index 0e555b8cc..0e555b8cc 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb
+++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon/obmc-hwmon.service b/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service
index 806ce1310..806ce1310 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon/obmc-hwmon.service
+++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-hwmon/obmc-hwmon.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb
index 3b77460cf..3b77460cf 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb
+++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor/org.openbmc.Sensors.service b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
index 4fa5a5a75..4fa5a5a75 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor/org.openbmc.Sensors.service
+++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
index 7a82fb5bc..7a82fb5bc 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb
+++ b/meta-phosphor/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-libobmc/obmc-libobmc-intf.bb b/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
index 39043c0cf..39043c0cf 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-libobmc/obmc-libobmc-intf.bb
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py
index c8080ac2c..c8080ac2c 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.py
+++ b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
index 3a68b68d8..3a68b68d8 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/files/obmc-phosphor-sysd.service
+++ b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb
index 99f561853..99f561853 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc.bb
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc/org.openbmc.control.Bmc@.service b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
index 4d26f961b..4d26f961b 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-control-bmc/org.openbmc.control.Bmc@.service
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state.bb
index 464cf110a..464cf110a 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state.bb
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
index 2a07c2b28..2a07c2b28 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.service
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.target b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target
index fef2a1ff0..fef2a1ff0 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-state/obmc-mgr-state.target
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.target
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
index 8b97e62bf..8b97e62bf 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system.bb
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
index abca0dc68..abca0dc68 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/org.openbmc.managers.System.service
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/startup-hacks.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service
index 2fca98649..2fca98649 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-mgr-system/startup-hacks.service
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
index bcb5d32ad..bcb5d32ad 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service b/meta-phosphor/common/recipes-phosphor/users/files/obmc-phosphor-user.service
index 7c1ffce13..7c1ffce13 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/files/obmc-phosphor-user.service
+++ b/meta-phosphor/common/recipes-phosphor/users/files/obmc-phosphor-user.service
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb
index f1f589b1e..f1f589b1e 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-user/obmc-phosphor-user.bb
+++ b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb