diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
index 6ae8c12..b765e1e 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 POWER_OK_SLOT=$(( $1+9 ))
 slot=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
index 9c26915..a8a110e 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-powercycle@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-powercycle %i
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-powercycle %i
 
 [Install]
 WantedBy=obmc-chassis-powercycle@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
index 2bdf491..f7d6448 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 POWER_OK_SLOT=$(( $1+9 ))
 slot=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
index b996b34..09494c1 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweroff@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-poweroff %i
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-poweroff %i
 
 [Install]
 WantedBy=obmc-chassis-hard-poweroff@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
index 0e8b702..9fe8315 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 POWER_OK_SLOT=$(( $1+9 ))
 slot=$(( $1-1 ))
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
index d19d59f..f706741 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/chassis-poweron@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-poweron %i
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-poweron %i
 
 [Install]
 WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
index ab39bcb..81cb429 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
index 57bd2a0..f45e71f 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powercycle@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-powercycle %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-powercycle %i
 
 [Install]
 WantedBy=obmc-host-reboot@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
index 096e08f..70e8474 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
index 69723d3..3ead57e 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweroff@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-poweroff %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-poweroff %i
 
 [Install]
 WantedBy=obmc-host-shutdown@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
index 234423e..008ff45 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 # Host Power On
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
index a90793a..6f59a6b 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-poweron@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-poweron %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-poweron %i
 
 [Install]
 WantedBy=obmc-host-start@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
index f08c131..e4bf1ff 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset
@@ -2,7 +2,7 @@
 
 # Provide source directive to shellcheck.
 # shellcheck source=meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-cmd
-source /usr/libexec/power-cmd
+source /usr/libexec/phosphor-state-manager/power-cmd
 
 SLOT_ID=$(( $1-1  << 2 ))
 
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
index f999d12..0fd059c 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/host-powerreset@.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/host-powerreset %i
+ExecStart=/usr/libexec/phosphor-state-manager/host-powerreset %i
 
 [Install]
 WantedBy=obmc-host-force-warm-reboot@%i.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
index 57b6bb6..d6b2118 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/sled-cycle.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/chassis-powercycle 0
+ExecStart=/usr/libexec/phosphor-state-manager/chassis-powercycle 0
 
 [Install]
 WantedBy=obmc-chassis-powercycle@0.target
diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 8c60835..b0acf75 100644
--- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -44,14 +44,14 @@
     install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/
 
     install -d ${D}${libexecdir}/${PN}
-    install -m 0777 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-poweroff ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-poweron ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-powercycle ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/host-powerreset ${D}${libexecdir}/
-    install -m 0777 ${WORKDIR}/power-cmd ${D}${libexecdir}/
+    install -m 0777 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-poweroff ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-powercycle ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/
+    install -m 0777 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/
     install -m 0777 ${WORKDIR}/power-ctrl-init ${D}${libexecdir}/${PN}/
 }