diff --git a/meta-witherspoon/recipes-phosphor/events/events-policy.bb b/meta-witherspoon/recipes-phosphor/dbus/events-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/events/events-policy.bb
rename to meta-witherspoon/recipes-phosphor/dbus/events-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/events/events-policy/config.yaml b/meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/events/events-policy/config.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy.bb b/meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy.bb
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/swift/air-cooled.yaml b/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/swift/air-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/swift/fan-errors.yaml b/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/swift/fan-errors.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/swift/water-cooled.yaml b/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/swift/water-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/air-cooled.yaml b/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/air-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/fan-errors.yaml b/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/fan-errors.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/water-cooled.yaml b/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/water-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb b/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb
rename to meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml b/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb b/meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb
rename to meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/fans/thermal-policy/thermal-policy.yaml b/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/thermal-policy.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/thermal-policy/thermal-policy.yaml
rename to meta-witherspoon/recipes-phosphor/dbus/thermal-policy/thermal-policy.yaml