diff --git a/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/files/greatlakes-system-state-init b/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/files/greatlakes-system-state-init
index 153d3f9..6109bea 100644
--- a/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/files/greatlakes-system-state-init
+++ b/meta-facebook/meta-greatlakes/recipes-greatlakes/greatlakes-sysinit/files/greatlakes-system-state-init
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID="$1"
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
similarity index 93%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
index bbf1c91..ccc3b0e 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff
similarity index 91%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff
index bde6ce0..a5c38bd 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 CHASSIS_ID=$1
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweron
similarity index 91%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweron
index 08b1e30..88e9ef3 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweron
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 CHASSIS_ID=$1
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powercycle
similarity index 92%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powercycle
index 47fecfc..15cf518 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powercycle
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 HOST_ID=$1
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powercycle@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powercycle@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweroff
similarity index 93%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweroff
index b322faa..f5a0118 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweroff
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 HOST_ID=$1
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweroff@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweroff@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweron
similarity index 93%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweron
index 5d8fab3..0181a4c 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweron
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 HOST_ID=$1
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweron@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-poweron@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powerreset
similarity index 92%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powerreset
index b90c5f0..fd6041f 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powerreset
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 HOST_ID=$1
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powerreset@.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/host-powerreset@.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-ctrl-init
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-ctrl-init
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-ctrl-init.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-ctrl-init.service
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/sled-cycle.service
similarity index 100%
rename from meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
rename to meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/sled-cycle.service
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend
new file mode 100644
index 0000000..9f116af
--- /dev/null
+++ b/meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -0,0 +1,46 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+CHASSIS_DEFAULT_TARGETS:remove = " \
+    obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
+    obmc-chassis-poweron@{}.target.requires/obmc-power-start@{}.service \
+    "
+
+SRC_URI:append = " \
+    file://chassis-poweroff@.service \
+    file://chassis-poweron@.service \
+    file://chassis-powercycle@.service \
+    file://host-poweroff@.service \
+    file://host-poweron@.service \
+    file://host-powercycle@.service \
+    file://host-powerreset@.service \
+    file://power-ctrl-init.service \
+    file://chassis-poweroff \
+    file://chassis-poweron \
+    file://chassis-powercycle \
+    file://host-poweroff \
+    file://host-poweron \
+    file://host-powercycle \
+    file://host-powerreset \
+    file://power-cmd \
+    file://power-ctrl-init \
+    "
+
+RDEPENDS:${PN}:append = " bash"
+
+do_install:append () {
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
+
+    install -d ${D}${libexecdir}/${PN}
+    install -m 0755 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
+    install -m 0755 ${WORKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
+}
+
+SYSTEMD_SERVICE:${PN}-bmc:append = "power-ctrl-init.service"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
index 1f61e15..65b9900 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2120
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 #IO 0:7 input port for showing slot 1:8 power status
 #IO 8:16 output port for controlling slot 1:8 power status
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff
index 98692ea..d6971ea 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2120
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 #IO 0:7 input port for showing slot 1:8 power status
 #IO 8:16 output port for controlling slot 1:8 power status
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron
index fbd6009..9ef3c58 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2120
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*)
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle
index 3958354..bc28548 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2120
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 # TODO: check power status before do power cycle
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff
index 210aabe..214c6be 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2120
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 # TODO: check power status before do power off
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron
index 8a2a19b..43877c7 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 # TODO: check power status before do power on
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset
index 03c63b2..700edd7 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset
@@ -3,7 +3,7 @@
 # shellcheck disable=SC2120
 
 # Provide source directive to shellcheck.
-# shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
+# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd
 source /usr/libexec/phosphor-state-manager/power-cmd
 
 # TODO: check power status before do power reset
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 8d48c68..fb6970c 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 HOST_DEFAULT_TARGETS:append = " \
     obmc-host-shutdown@{}.target.wants/host-poweroff@{}.service \
@@ -17,49 +17,4 @@
     obmc-chassis-poweroff@{}.target.requires/obmc-powered-off@{}.service \
 "
 
-CHASSIS_DEFAULT_TARGETS:remove:greatlakes = " \
-    obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \
-    obmc-chassis-poweron@{}.target.requires/obmc-power-start@{}.service \
-    "
-
-SRC_URI:append:greatlakes = " \
-    file://chassis-poweroff@.service \
-    file://chassis-poweron@.service \
-    file://chassis-powercycle@.service \
-    file://host-poweroff@.service \
-    file://host-poweron@.service \
-    file://host-powercycle@.service \
-    file://host-powerreset@.service \
-    file://power-ctrl-init.service \
-    file://chassis-poweroff \
-    file://chassis-poweron \
-    file://chassis-powercycle \
-    file://host-poweroff \
-    file://host-poweron \
-    file://host-powercycle \
-    file://host-powerreset \
-    file://power-cmd \
-    file://power-ctrl-init \
-    "
-
-RDEPENDS:${PN}:append:greatlakes = " bash"
-
-do_install:append:greatlakes() {
-    install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
-
-    install -d ${D}${libexecdir}/${PN}
-    install -m 0755 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
-    install -m 0755 ${WORKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
-}
-
 FILES:${PN} += " ${systemd_system_unitdir}/*.service"
-
-SYSTEMD_SERVICE:${PN}-bmc:append:greatlakes = "power-ctrl-init.service"