diff --git a/architecture/LED-architecture.md b/architecture/LED-architecture.md
index e8fbd65..3653fbc 100644
--- a/architecture/LED-architecture.md
+++ b/architecture/LED-architecture.md
@@ -198,7 +198,7 @@
     ```PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native"```
 
 
-[LED D-Bus README]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Led/README.md
+[LED D-Bus README]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Led/README.md
 [LED YAML]: https://github.com/openbmc/phosphor-led-manager/blob/master/led.yaml
 [Kernel ARM DTS]: https://github.com/openbmc/linux/tree/dev-4.19/arch/arm/boot/dts
 [Palmetto DTS LED]: https://github.com/openbmc/linux/blob/dev-4.19/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts#L45
diff --git a/architecture/code-update/code-update-diagrams.md b/architecture/code-update/code-update-diagrams.md
index 8788348..1d6078e 100644
--- a/architecture/code-update/code-update-diagrams.md
+++ b/architecture/code-update/code-update-diagrams.md
@@ -57,7 +57,7 @@
        image
 
 ```
-- [1] [Software D-Bus Object](https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Software)
+- [1] [Software D-Bus Object](https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/Software)
 - [*] In a static layout configuration, the images are stored in RAM and the
       content is written to flash during BMC reboot. Reference the update and
       shutdown scripts provided by [initrdscripts](https://github.com/openbmc/openbmc/tree/master/meta-phosphor/recipes-phosphor/initrdscripts)
diff --git a/architecture/code-update/code-update.md b/architecture/code-update/code-update.md
index a6c981b..8ce7175 100644
--- a/architecture/code-update/code-update.md
+++ b/architecture/code-update/code-update.md
@@ -347,7 +347,7 @@
 ```
 
 More information on field mode can be found here:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/FieldMode.interface.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Control/FieldMode.interface.yaml
 
 ### Software Factory Reset
 
@@ -393,5 +393,5 @@
 ### Implementation
 
 More information about the implementation of the code update can be found at
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Software
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software
 and https://github.com/openbmc/phosphor-bmc-code-mgmt
diff --git a/architecture/code-update/firmware-update-over-redfish.md b/architecture/code-update/firmware-update-over-redfish.md
index 70b16f5..5442337 100644
--- a/architecture/code-update/firmware-update-over-redfish.md
+++ b/architecture/code-update/firmware-update-over-redfish.md
@@ -235,10 +235,10 @@
 [5]: https://www.supermicro.com/manuals/other/RedfishRefGuide.pdf
 [6]: https://github.com/dell/iDRAC-Redfish-Scripting/blob/master/Redfish%20Python/DeviceFirmwareDellUpdateServiceREDFISH.py
 [7]: https://github.com/openbmc/bmcweb/blob/master/redfish-core/lib/update_service.hpp
-[8]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Software/README.md
+[8]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software/README.md
 [9]: https://github.com/openbmc/openbmc-test-automation
 [10]: https://github.com/DMTF/Redfish/issues/3357
 [11]: https://github.com/DMTF/Redfish/pull/3296
 [12]: https://github.com/DMTF/Redfish/pull/3420
-[13]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Software/Activation.interface.yaml
+[13]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software/Activation.interface.yaml
 [14]: http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status
diff --git a/architecture/code-update/host-code-update.md b/architecture/code-update/host-code-update.md
index f9b98a0..90f9056 100644
--- a/architecture/code-update/host-code-update.md
+++ b/architecture/code-update/host-code-update.md
@@ -2,7 +2,7 @@
 ================
 
 Reference:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Software
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software
 
 Following are the steps to update the host firmware (or "BIOS"). This assumes
 the host is not accessing its firmware.
diff --git a/architecture/interface-overview.md b/architecture/interface-overview.md
index d702987..400cb92 100644
--- a/architecture/interface-overview.md
+++ b/architecture/interface-overview.md
@@ -32,7 +32,7 @@
 interface.
 
 [systemd concepts]: https://www.freedesktop.org/software/systemd/man/systemd.html#Concepts
-[Service Management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/Service/README.md
+[Service Management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Control/Service/README.md
 
 Diagrams are included to help visualize relationships.  The diagrams show
 management agents on the left side, the BMC in the center, and host elements
@@ -371,7 +371,7 @@
 The BMC's RMCP+ IPMI interface is designed to be operated by the
 `[ipmitool][]` external command.
 
-[IPMI Session management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Ipmi/SESSION_README.md
+[IPMI Session management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md
 [ipmitool]: https://github.com/ipmitool/ipmitool
 
 ### Host IPMI
diff --git a/architecture/object-mapper.md b/architecture/object-mapper.md
index e2efdda..7887b1d 100644
--- a/architecture/object-mapper.md
+++ b/architecture/object-mapper.md
@@ -277,4 +277,4 @@
 }
 
 ```
-[1]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/ObjectMapper.interface.yaml
+[1]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/ObjectMapper.interface.yaml
diff --git a/architecture/openbmc-systemd.md b/architecture/openbmc-systemd.md
index 3adae4f..bda20ad 100644
--- a/architecture/openbmc-systemd.md
+++ b/architecture/openbmc-systemd.md
@@ -102,7 +102,7 @@
 ## Server Quiesce
 The `obmc-host-quiesce@.target` is utilized in host error scenarios. When the
 `obmc-host-quiesce@0.target` is entered, it puts the host state D-Bus
-[object][https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/Host.interface.yaml]
+[object][https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/Host.interface.yaml]
 in a `Quiesced` state.
 
 ## Server Emergency Power Off due to Error
@@ -122,7 +122,7 @@
 ## Systemd Control in OpenBMC
 There are a collection of services within OpenBMC that interact with systemd and
 its unit files, providing somewhat of an abstraction layer from the user of the
-OpenBMC system and systemd.  See the [state](https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/State)
+OpenBMC system and systemd.  See the [state](https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/State)
 interfaces for more information on this function.
 
 For example, if you wanted to execute the server power on function, you would do
diff --git a/architecture/sensor-architecture.md b/architecture/sensor-architecture.md
index 8aafe20..40a904b 100644
--- a/architecture/sensor-architecture.md
+++ b/architecture/sensor-architecture.md
@@ -436,16 +436,16 @@
 [1]: https://dbus.freedesktop.org/doc/dbus-tutorial.html
 [2]: https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
 [3]: https://dbus.freedesktop.org/doc/dbus-specification.html#basic-types
-[4]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Sensor
+[4]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/Sensor
 [5]: https://github.com/openbmc/phosphor-dbus-interfaces
-[6]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
+[6]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
 [7]: https://github.com/openbmc/openbmc/tree/master/meta-openbmc-machines
 [8]: https://github.com/openbmc/openbmc/blob/master/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf
 [9]: https://lists.ozlabs.org/pipermail/openbmc/2016-November/005309.html
 [10]: https://github.com/openbmc/bmcweb/blob/master/DEVELOPING.md#redfish
 [11]: https://github.com/openbmc/docs/blob/master/architecture/object-mapper.md#associations
-[12]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Inventory/Item.interface.yaml
-[13]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml
-[14]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml
+[12]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
+[13]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml
+[14]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml
 [15]: https://github.com/openbmc/phosphor-hwmon
 [16]: https://github.com/openbmc/dbus-sensors
diff --git a/architecture/user-management.md b/architecture/user-management.md
index 402c5ae..65f95e4 100644
--- a/architecture/user-management.md
+++ b/architecture/user-management.md
@@ -68,7 +68,7 @@
 User Manager service exposes D-Bus methods for user-management operations.
 It exposes `xyz.openbmc_project.User.Manager` as a service and handles
 objects through `org.freedesktop.DBus.ObjectManager`. Please refer
-https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/User
+https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/User
 for detailed user management D-Bus API and interfaces.
 
 ## OpenBMC - User Management - High Level architectural diagram
diff --git a/designs/boot-progress.md b/designs/boot-progress.md
index 18852a5..7897208 100644
--- a/designs/boot-progress.md
+++ b/designs/boot-progress.md
@@ -132,9 +132,9 @@
 
 
 [1]: https://github.com/openbmc/phosphor-state-manager#state-tracking-and-control
-[2]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/Host.interface.yaml
-[3]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/Boot/Progress.interface.yaml
-[4]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml
+[2]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/Host.interface.yaml
+[3]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/Boot/Progress.interface.yaml
+[4]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml
 [5]: https://www.dmtf.org/sites/default/files/standards/documents/DSP0249_1.0.0.pdf
 [6]: http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status
 [7]: https://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_13_0.json
diff --git a/designs/error-log-handling-for-phal.md b/designs/error-log-handling-for-phal.md
index 70fbfa8..716e1aa 100644
--- a/designs/error-log-handling-for-phal.md
+++ b/designs/error-log-handling-for-phal.md
@@ -154,7 +154,7 @@
 [1]: (https://github.com/openbmc/phosphor-logging/blob/master/extensions/openpower-pels/README.md)
 [2]: (https://gerrit.openbmc-project.xyz/#/c/openbmc/docs/+/27804/2/designs/gard_on_bmc.md)
 [3]: (https://github.com/openbmc/phosphor-logging)
-[4]: (https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Logging/Create.interface.yaml)
+[4]: (https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Logging/Create.interface.yaml)
 [5]: (https://github.com/dgibson/dtc)
 [6]: (https://github.com/open-power/pdbg)
 [7]: (https://elinux.org/Device_Tree_Reference)
diff --git a/designs/fail-boot-on-hw-error.md b/designs/fail-boot-on-hw-error.md
index 0bf0c0a..3ad7c65 100644
--- a/designs/fail-boot-on-hw-error.md
+++ b/designs/fail-boot-on-hw-error.md
@@ -139,5 +139,5 @@
 [1]: https://lists.ozlabs.org/pipermail/openbmc/2020-February/020575.html
 [2]: https://github.com/openbmc/phosphor-settingsd
 [3]: https://github.com/openbmc/docs/blob/master/architecture/object-mapper.md#associations
-[4]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Common/Callout/README.md
+[4]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Common/Callout/README.md
 [5]: https://github.com/openbmc/phosphor-logging/blob/master/extensions/openpower-pels/README.md
diff --git a/designs/psu-firmware-update.md b/designs/psu-firmware-update.md
index 2c204e6..a86efad 100644
--- a/designs/psu-firmware-update.md
+++ b/designs/psu-firmware-update.md
@@ -214,9 +214,9 @@
   plugged in.
 
 
-[1]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Software
+[1]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/Software
 [2]: https://github.com/openbmc/phosphor-bmc-code-mgmt/
 [3]: https://github.com/openbmc/openpower-pnor-code-mgmt/
 [4]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/57b878d048f929643276f1bf7fdf750abc4bde8b/xyz/openbmc_project/Software/Version.interface.yaml#L14
-[5]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Software/Activation.interface.yaml
+[5]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software/Activation.interface.yaml
 
diff --git a/designs/psu-monitoring.md b/designs/psu-monitoring.md
index 7337427..93dc267 100644
--- a/designs/psu-monitoring.md
+++ b/designs/psu-monitoring.md
@@ -145,7 +145,7 @@
 
 [1]: https://github.com/openbmc/witherspoon-pfault-analysis
 [2]: https://en.wikipedia.org/wiki/Power_Management_Bus
-[3]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/README.msl.md
+[3]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Control/README.msl.md
 [4]: https://github.com/openbmc/linux/blob/dev-5.3/drivers/hwmon/pmbus/ibm-cffps.c
 [5]: https://github.com/openbmc/witherspoon-pfault-analysis/tree/master/power-supply
 [6]: https://github.com/openbmc/phosphor-power/
diff --git a/designs/redfish-health-rolllup.md b/designs/redfish-health-rolllup.md
index 54e0822..12758f8 100644
--- a/designs/redfish-health-rolllup.md
+++ b/designs/redfish-health-rolllup.md
@@ -49,28 +49,28 @@
 https://github.com/openbmc/bmcweb/blob/master/static/redfish/v1/schema/Resource_v1.xml#L197
 
 Threshold interface (Currently unused by some vendors):
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Sensor/Threshold.errors.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Sensor/Threshold.errors.yaml
 
 Associations In Sensors:
 https://lists.ozlabs.org/pipermail/openbmc/2019-February/015188.html
 
 Association Definition Interface:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Association/Definitions.interface.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Association/Definitions.interface.yaml
 
 Operational Status Interface:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml
 
 Redfish schema guide:
 https://www.dmtf.org/sites/default/files/standards/documents/DSP2046_2018.1_0.pdf
 
 BMC inventory interface:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml
 
 System inventory interface:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Inventory/Item/System.interface.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Inventory/Item/System.interface.yaml
 
 Item interface:
-https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Inventory/Item.interface.yaml
+https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
 
 ## Requirements
 - Must minimize D-Bus calls needed to get health rollup
diff --git a/designs/telemetry.md b/designs/telemetry.md
index 50c9878..80d9eb1 100644
--- a/designs/telemetry.md
+++ b/designs/telemetry.md
@@ -808,6 +808,6 @@
 [5]: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/22257
 [6]: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/24749
 [7]: https://github.com/google/googletest
-[8]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Telemetry/ReportManager.interface.yaml
-[9]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Telemetry/Report.interface.yaml
-[10]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Object/Delete.interface.yaml
+[8]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Telemetry/ReportManager.interface.yaml
+[9]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Telemetry/Report.interface.yaml
+[10]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Object/Delete.interface.yaml
diff --git a/features.md b/features.md
index 7fbfc0e..7d6c0f9 100644
--- a/features.md
+++ b/features.md
@@ -39,23 +39,23 @@
 [Automated Testing]: https://github.com/openbmc/openbmc-test-automation/blob/master/README.md
 [BMCWeb]: https://github.com/openbmc/bmcweb/blob/master/README.md
 [BMCWeb Redfish]: https://github.com/openbmc/bmcweb/blob/master/DEVELOPING.md#redfish
-[Certificate management]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Certs/README.md
-[Chassis Power control]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Chassis/README.md
+[Certificate management]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/Certs/README.md
+[Chassis Power control]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Chassis/README.md
 [D-Bus interfaces]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/README.md
 [D-Bus Object Mapper]: https://github.com/openbmc/docs/blob/master/architecture/object-mapper.md
 [Entity manager]: https://github.com/openbmc/entity-manager/blob/master/README.md
-[Factory reset]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Common/FactoryReset/README.md
+[Factory reset]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/Common/FactoryReset/README.md
 [Firmware update support]: https://github.com/openbmc/docs/blob/master/architecture/code-update/code-update.md
 [Hardware Diagnostics]: https://github.com/openbmc/openpower-hw-diags/blob/master/README.md
 [Host management]: https://github.com/openbmc/docs/blob/master/host-management.md
 [Host management REST APIs]: https://github.com/openbmc/docs/blob/master/host-management.md
 [IPMI in band]: https://github.com/openbmc/docs/blob/master/architecture/ipmi-architecture.md
 [IPMI out of band]: https://github.com/openbmc/ipmitool/blob/master/README
-[LED Groups]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Led/README.md
+[LED Groups]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Led/README.md
 [LEDs]: https://github.com/openbmc/docs/blob/master/architecture/LED-architecture.md
-[Logging Callouts]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Common/Callout/README.md
+[Logging Callouts]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/Common/Callout/README.md
 [MSL application]: https://github.com/openbmc/phosphor-dbus-monitor/blob/master/mslverify/README.md
-[Network management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Network/README.md
+[Network management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Network/README.md
 [Phosphor Certificate Manager]: https://github.com/openbmc/phosphor-certificate-manager/blob/master/README.md
 [Phosphor Fan Control]: https://github.com/openbmc/phosphor-fan-presence/blob/master/README.md
 [Phosphor inventory manager]: https://github.com/openbmc/phosphor-inventory-manager/blob/master/README.md
@@ -68,5 +68,5 @@
 [Remote KVM]: https://github.com/openbmc/obmc-ikvm/blob/master/README.md
 [Sensors]: https://github.com/openbmc/docs/blob/master/architecture/sensor-architecture.md
 [Simulation]: https://github.com/openbmc/docs/blob/master/development/dev-environment.md
-[Power State management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/README.md
+[Power State management]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/README.md
 [SOL How to use]: https://github.com/openbmc/docs/blob/master/console.md
diff --git a/host-management.md b/host-management.md
index 6bc6a2f..08989a7 100644
--- a/host-management.md
+++ b/host-management.md
@@ -177,9 +177,9 @@
 
 With OpenBMC, the Host boot options are stored as D-Bus properties under the
 `control/host0/boot` path. Properties include
-[`BootMode`](https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/Boot/Mode.interface.yaml)
+[`BootMode`](https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Control/Boot/Mode.interface.yaml)
 and
-[`BootSource`](https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/Boot/Source.interface.yaml).
+[`BootSource`](https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Control/Boot/Source.interface.yaml).
 
  * Set boot mode:
 
@@ -225,7 +225,7 @@
 
 
 More information about Host State Management can be found here:
-https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/State
+https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/yaml/xyz/openbmc_project/State
 
 ## Host Clear GARD
 
@@ -290,4 +290,4 @@
 The host controls the watchdog timeout and enable/disable once it starts.
 
 [1]: https://github.com/openbmc/phosphor-watchdog
-[2]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/State/Watchdog.interface.yaml
+[2]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml