diff --git a/common/recipes-phosphor/host-ipmid/btbridged.bb b/common/recipes-phosphor/ipmi/btbridged.bb
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/btbridged.bb
rename to common/recipes-phosphor/ipmi/btbridged.bb
diff --git a/common/recipes-phosphor/host-ipmid/btbridged/org.openbmc.HostIpmi.service b/common/recipes-phosphor/ipmi/btbridged/org.openbmc.HostIpmi.service
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/btbridged/org.openbmc.HostIpmi.service
rename to common/recipes-phosphor/ipmi/btbridged/org.openbmc.HostIpmi.service
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb b/common/recipes-phosphor/ipmi/host-ipmi-hw-example.bb
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
rename to common/recipes-phosphor/ipmi/host-ipmi-hw-example.bb
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/common/recipes-phosphor/ipmi/host-ipmid-fru.bb
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
rename to common/recipes-phosphor/ipmi/host-ipmid-fru.bb
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-fru/obmc-read-eeprom@.service b/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid-fru/obmc-read-eeprom@.service
rename to common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb b/common/recipes-phosphor/ipmi/host-ipmid-oem.bb
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
rename to common/recipes-phosphor/ipmi/host-ipmid-oem.bb
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb b/common/recipes-phosphor/ipmi/host-ipmid-tool.bb
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
rename to common/recipes-phosphor/ipmi/host-ipmid-tool.bb
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/ipmi/host-ipmid.bb
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid.bb
rename to common/recipes-phosphor/ipmi/host-ipmid.bb
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid/op-stop-host@.service b/common/recipes-phosphor/ipmi/host-ipmid/op-stop-host@.service
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid/op-stop-host@.service
rename to common/recipes-phosphor/ipmi/host-ipmid/op-stop-host@.service
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid/org.openbmc.HostServices.service b/common/recipes-phosphor/ipmi/host-ipmid/org.openbmc.HostServices.service
similarity index 100%
rename from common/recipes-phosphor/host-ipmid/host-ipmid/org.openbmc.HostServices.service
rename to common/recipes-phosphor/ipmi/host-ipmid/org.openbmc.HostServices.service