diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
new file mode 100644
index 0000000..268caf5
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -0,0 +1,67 @@
+SUMMARY = "OpenBMC for OpenPOWER - Applications"
+PR = "r1"
+
+inherit packagegroup
+inherit obmc-phosphor-license
+
+PROVIDES = "${PACKAGES}"
+PACKAGES = " \
+        ${PN}-sensors \
+        ${PN}-chassis \
+        ${PN}-fans \
+        ${PN}-flash \
+        ${PN}-system \
+        "
+
+PROVIDES += "virtual/obmc-sensor-mgmt"
+PROVIDES += "virtual/obmc-chassis-mgmt"
+PROVIDES += "virtual/obmc-fan-mgmt"
+PROVIDES += "virtual/obmc-flash-mgmt"
+PROVIDES += "virtual/obmc-system-mgmt"
+
+RPROVIDES_${PN}-sensors += "virtual-obmc-sensor-mgmt"
+RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
+
+SUMMARY_${PN}-sensors = "OpenPOWER Sensors"
+RDEPENDS_${PN}-sensors = " \
+        obmc-hwmon \
+        obmc-mgr-sensor \
+        "
+
+SUMMARY_${PN}-chassis = "OpenPOWER Chassis"
+RDEPENDS_${PN}-chassis = " \
+        obmc-button-power \
+        obmc-button-reset \
+        obmc-control-chassis \
+        obmc-hostcheckstop \
+        obmc-mgr-inventory \
+        obmc-op-control-power \
+        obmc-pcie-detect \
+        obmc-watchdog \
+        obmc-op-control-host \
+        obmc-control-led \
+        "
+
+SUMMARY_${PN}-sensors = "OpenPOWER Fans"
+RDEPENDS_${PN}-fans = " \
+        obmc-hwmon \
+        obmc-control-fan \
+        "
+
+SUMMARY_${PN}-flash = "OpenPOWER Flash"
+RDEPENDS_${PN}-flash = " \
+        obmc-flash-bios \
+        obmc-flash-bmc \
+        obmc-mgr-download \
+        obmc-op-flasher \
+        obmc-control-bmc \
+        "
+
+SUMMARY_${PN}-system = "OpenPOWER System"
+RDEPENDS_${PN}-system = " \
+        obmc-mgr-system \
+        obmc-mgr-state \
+        "
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bbappend
new file mode 100644
index 0000000..fb36050
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-phosphor-apps.bbappend
@@ -0,0 +1 @@
+RDEPENDS_${PN}-extrasdev += "obmc-pydevtools"
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index 4e79587..d70cbe6 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -10,8 +10,8 @@
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
 
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "btbridged"
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "skeleton"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "skeleton"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "skeleton"
-PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "skeleton"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "skeleton"
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps"
+PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "packagegroup-op-apps"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
new file mode 100644
index 0000000..c0b52cf
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
@@ -0,0 +1,2 @@
+RDEPENDS_${PN}-chassis_remove += "obmc-button-reset"
+RDEPENDS_${PN}-fans_remove += "obmc-control-fan"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/skeleton%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/skeleton%.bbappend
deleted file mode 100644
index 27784e0..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/skeleton%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_skeleton_remove += "obmc-control-fan"
-RDEPENDS_skeleton_remove += "obmc-button-reset"
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
deleted file mode 100644
index 05ac00a..0000000
--- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Temp placeholder for skeleton function"
-DESCRIPTION = "Temp placeholder for skeleton repository"
-HOMEPAGE = "http://github.com/openbmc/skeleton"
-PR = "r1"
-
-inherit packagegroup
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/obmc-chassis-mgmt"
-RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt"
-PROVIDES += "virtual/obmc-fan-mgmt"
-RPROVIDES_${PN} += "virtual-obmc-fan-mgmt"
-PROVIDES += "virtual/obmc-flash-mgmt"
-RPROVIDES_${PN} += "virtual-obmc-flash-mgmt"
-PROVIDES += "virtual/obmc-sensor-mgmt"
-RPROVIDES_${PN} += "virtual-obmc-sensor-mgmt"
-PROVIDES += "virtual/obmc-system-mgmt"
-RPROVIDES_${PN} += "virtual-obmc-system-mgmt"
-
-RDEPENDS_${PN} += " \
-        obmc-button-power \
-        obmc-button-reset \
-        obmc-control-chassis \
-        obmc-hostcheckstop \
-        obmc-mgr-inventory \
-        obmc-op-control-power \
-        obmc-pcie-detect \
-        obmc-watchdog \
-        obmc-pydevtools \
-        obmc-control-fan \
-        obmc-flash-bios \
-        obmc-flash-bmc \
-        obmc-mgr-download \
-        obmc-op-flasher \
-        obmc-op-control-host \
-        obmc-control-led \
-        obmc-hwmon \
-        obmc-mgr-sensor \
-        obmc-control-bmc \
-        obmc-mgr-state \
-        obmc-mgr-system \
-        "