diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%.bbappend
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%.bbappend
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%.bbappend
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/hdd_backplane
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/io_board
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/motherboard
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/host-ipmid/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/host-ipmid-fru%/obmc/eeproms/system/chassis/sas_expander
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/ipmi/btbridged.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/btbridged.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/org.openbmc.HostIpmi.service b/meta-phosphor/common/recipes-phosphor/ipmi/btbridged/org.openbmc.HostIpmi.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/org.openbmc.HostIpmi.service
rename to meta-phosphor/common/recipes-phosphor/ipmi/btbridged/org.openbmc.HostIpmi.service
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmi-hw-example.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmi-hw-example.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru/obmc-read-eeprom@.service b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru/obmc-read-eeprom@.service
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-fru/obmc-read-eeprom@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-oem.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-oem.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-tool.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid-tool.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid.bb
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/op-stop-host@.service b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/op-stop-host@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/op-stop-host@.service
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/op-stop-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/org.openbmc.HostServices.service b/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/org.openbmc.HostServices.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/org.openbmc.HostServices.service
rename to meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/org.openbmc.HostServices.service