diff --git a/gen/xyz/openbmc_project/Association/Definitions/meson.build b/gen/xyz/openbmc_project/Association/Definitions/meson.build
index c6adc99..30767e8 100644
--- a/gen/xyz/openbmc_project/Association/Definitions/meson.build
+++ b/gen/xyz/openbmc_project/Association/Definitions/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Association/Definitions__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Association/Definitions.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Association/Definitions.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Association/Definitions',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Association/meson.build b/gen/xyz/openbmc_project/Association/meson.build
index 742a6aa..c669583 100644
--- a/gen/xyz/openbmc_project/Association/meson.build
+++ b/gen/xyz/openbmc_project/Association/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Association__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Association.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Association.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Association',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Definitions')
 generated_others += custom_target(
     'xyz/openbmc_project/Association/Definitions__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Association/Definitions.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Association/Definitions.interface.yaml',  ],
     output: [ 'Definitions.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Association/Definitions',
     ],
 )
diff --git a/gen/xyz/openbmc_project/BIOSConfig/Common/meson.build b/gen/xyz/openbmc_project/BIOSConfig/Common/meson.build
index 49393cc..1916fb7 100644
--- a/gen/xyz/openbmc_project/BIOSConfig/Common/meson.build
+++ b/gen/xyz/openbmc_project/BIOSConfig/Common/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/BIOSConfig/Common__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/BIOSConfig/Common.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/BIOSConfig/Common.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/BIOSConfig/Common',
     ],
 )
diff --git a/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build b/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build
index f9bca6b..1b05095 100644
--- a/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build
+++ b/gen/xyz/openbmc_project/BIOSConfig/Manager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/BIOSConfig/Manager__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/BIOSConfig/Manager.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/BIOSConfig/Manager.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/BIOSConfig/Manager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build b/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build
index c216cc8..faf400f 100644
--- a/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build
+++ b/gen/xyz/openbmc_project/BIOSConfig/Password/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/BIOSConfig/Password__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/BIOSConfig/Password.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/BIOSConfig/Password.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/BIOSConfig/Password',
     ],
 )
diff --git a/gen/xyz/openbmc_project/BIOSConfig/meson.build b/gen/xyz/openbmc_project/BIOSConfig/meson.build
index b7db2d6..2cd0b89 100644
--- a/gen/xyz/openbmc_project/BIOSConfig/meson.build
+++ b/gen/xyz/openbmc_project/BIOSConfig/meson.build
@@ -2,13 +2,13 @@
 subdir('Common')
 generated_others += custom_target(
     'xyz/openbmc_project/BIOSConfig/Common__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/BIOSConfig/Common.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/BIOSConfig/Common.errors.yaml',  ],
     output: [ 'Common.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/BIOSConfig/Common',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Manager')
 generated_others += custom_target(
     'xyz/openbmc_project/BIOSConfig/Manager__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/BIOSConfig/Manager.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/BIOSConfig/Manager.interface.yaml',  ],
     output: [ 'Manager.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/BIOSConfig/Manager',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Password')
 generated_others += custom_target(
     'xyz/openbmc_project/BIOSConfig/Password__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/BIOSConfig/Password.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/BIOSConfig/Password.interface.yaml',  ],
     output: [ 'Password.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/BIOSConfig/Password',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/Authority/meson.build b/gen/xyz/openbmc_project/Certs/Authority/meson.build
index e24a56f..dabec95 100644
--- a/gen/xyz/openbmc_project/Certs/Authority/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Authority/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Authority__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/Authority.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Authority.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/Authority',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build b/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
index e2e3e71..a87f61a 100644
--- a/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
+++ b/gen/xyz/openbmc_project/Certs/CSR/Create/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/CSR/Create__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Certs/CSR/Create.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Certs/CSR/Create.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Certs/CSR/Create',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/CSR/meson.build b/gen/xyz/openbmc_project/Certs/CSR/meson.build
index b1a000f..9997b14 100644
--- a/gen/xyz/openbmc_project/Certs/CSR/meson.build
+++ b/gen/xyz/openbmc_project/Certs/CSR/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/CSR__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/CSR.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/CSR.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/CSR',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Create')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/CSR/Create__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/CSR/Create.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/CSR/Create.interface.yaml',  ],
     output: [ 'Create.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/CSR/Create',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/Certificate/meson.build b/gen/xyz/openbmc_project/Certs/Certificate/meson.build
index 33f2442..a56e298 100644
--- a/gen/xyz/openbmc_project/Certs/Certificate/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Certificate/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Certificate__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/Certificate.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Certificate.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/Certificate',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/Entry/meson.build b/gen/xyz/openbmc_project/Certs/Entry/meson.build
index ca46401..088ff41 100644
--- a/gen/xyz/openbmc_project/Certs/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Entry/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Entry__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/Entry.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Entry.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/Entry',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/Install/meson.build b/gen/xyz/openbmc_project/Certs/Install/meson.build
index b2dac2a..f847a7d 100644
--- a/gen/xyz/openbmc_project/Certs/Install/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Install/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Install__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/Install.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Install.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/Install',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/Replace/meson.build b/gen/xyz/openbmc_project/Certs/Replace/meson.build
index d4a47ee..41ec35e 100644
--- a/gen/xyz/openbmc_project/Certs/Replace/meson.build
+++ b/gen/xyz/openbmc_project/Certs/Replace/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs/Replace__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Certs/Replace.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Certs/Replace.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Certs/Replace',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Certs/meson.build b/gen/xyz/openbmc_project/Certs/meson.build
index 4ea1e61..76d838a 100644
--- a/gen/xyz/openbmc_project/Certs/meson.build
+++ b/gen/xyz/openbmc_project/Certs/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Certs__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Authority')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/Authority__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs/Authority.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs/Authority.interface.yaml',  ],
     output: [ 'Authority.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs/Authority',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('CSR')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/CSR__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs/CSR.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs/CSR.interface.yaml',  ],
     output: [ 'CSR.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs/CSR',
     ],
 )
@@ -43,13 +43,13 @@
 subdir('Certificate')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/Certificate__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs/Certificate.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs/Certificate.interface.yaml',  ],
     output: [ 'Certificate.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs/Certificate',
     ],
 )
@@ -57,13 +57,13 @@
 subdir('Entry')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/Entry__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs/Entry.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs/Entry.interface.yaml',  ],
     output: [ 'Entry.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs/Entry',
     ],
 )
@@ -71,13 +71,13 @@
 subdir('Install')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/Install__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs/Install.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs/Install.interface.yaml',  ],
     output: [ 'Install.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs/Install',
     ],
 )
@@ -85,13 +85,13 @@
 subdir('Replace')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs/Replace__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Certs/Replace.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Certs/Replace.interface.yaml',  ],
     output: [ 'Replace.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Certs/Replace',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build b/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build
index 337acad..8f00188 100644
--- a/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build
+++ b/gen/xyz/openbmc_project/Channel/ChannelAccess/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Channel/ChannelAccess__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Channel/ChannelAccess.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Channel/ChannelAccess.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Channel/ChannelAccess',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Channel/meson.build b/gen/xyz/openbmc_project/Channel/meson.build
index cb6820a..ca94302 100644
--- a/gen/xyz/openbmc_project/Channel/meson.build
+++ b/gen/xyz/openbmc_project/Channel/meson.build
@@ -2,13 +2,13 @@
 subdir('ChannelAccess')
 generated_others += custom_target(
     'xyz/openbmc_project/Channel/ChannelAccess__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Channel/ChannelAccess.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Channel/ChannelAccess.interface.yaml',  ],
     output: [ 'ChannelAccess.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Channel/ChannelAccess',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
index 0152fbf..91b5a5a 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/ID/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/ID__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Chassis/Buttons/ID.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/ID.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/ID',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
index 54b6d28..a24384e 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/NMI/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/NMI__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Chassis/Buttons/NMI.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/NMI.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/NMI',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
index 54a6c45..45f0c07 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Power/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Power__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Chassis/Buttons/Power.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Power.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/Power',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
index 1d40734..02475c4 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/Reset/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Reset__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Chassis/Buttons/Reset.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Reset.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/Reset',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Buttons/meson.build b/gen/xyz/openbmc_project/Chassis/Buttons/meson.build
index ef98e00..1f2d193 100644
--- a/gen/xyz/openbmc_project/Chassis/Buttons/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Buttons/meson.build
@@ -2,13 +2,13 @@
 subdir('ID')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/ID__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Buttons/ID.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/ID.interface.yaml',  ],
     output: [ 'ID.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/ID',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('NMI')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/NMI__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Buttons/NMI.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/NMI.interface.yaml',  ],
     output: [ 'NMI.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/NMI',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Power')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Power__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Buttons/Power.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Power.interface.yaml',  ],
     output: [ 'Power.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/Power',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('Reset')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Buttons/Reset__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Buttons/Reset.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Buttons/Reset.interface.yaml',  ],
     output: [ 'Reset.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Buttons/Reset',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Common/meson.build b/gen/xyz/openbmc_project/Chassis/Common/meson.build
index 88dd00b..9613afb 100644
--- a/gen/xyz/openbmc_project/Chassis/Common/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Common/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Common__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Common.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Common.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Common',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build b/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
index 5650be4..497991b 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/NMISource/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Control/NMISource__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Chassis/Control/NMISource.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Control/NMISource.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Chassis/Control/NMISource',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build b/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
index 535c698..fc6be47 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/Power/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Control/Power__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Chassis/Control/Power.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Chassis/Control/Power.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Chassis/Control/Power',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Control/meson.build b/gen/xyz/openbmc_project/Chassis/Control/meson.build
index 70c7a06..822472b 100644
--- a/gen/xyz/openbmc_project/Chassis/Control/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Control/meson.build
@@ -2,13 +2,13 @@
 subdir('NMISource')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Control/NMISource__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Control/NMISource.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Control/NMISource.interface.yaml',  ],
     output: [ 'NMISource.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Control/NMISource',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Power')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Control/Power__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Control/Power.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Control/Power.interface.yaml',  ],
     output: [ 'Power.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Control/Power',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build b/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
index de52080..92fea2c 100644
--- a/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/Intrusion/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Chassis/Intrusion__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Chassis/Intrusion.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Chassis/Intrusion.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Chassis/Intrusion',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Chassis/meson.build b/gen/xyz/openbmc_project/Chassis/meson.build
index 9f05c98..9c80890 100644
--- a/gen/xyz/openbmc_project/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/Chassis/meson.build
@@ -3,13 +3,13 @@
 subdir('Common')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Common__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Chassis/Common.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Chassis/Common.errors.yaml',  ],
     output: [ 'Common.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Chassis/Common',
     ],
 )
@@ -18,13 +18,13 @@
 subdir('Intrusion')
 generated_others += custom_target(
     'xyz/openbmc_project/Chassis/Intrusion__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Chassis/Intrusion.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Chassis/Intrusion.interface.yaml',  ],
     output: [ 'Intrusion.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Chassis/Intrusion',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build b/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build
index 87dc63f..c4e7086 100644
--- a/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build
+++ b/gen/xyz/openbmc_project/Collection/DeleteAll/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Collection/DeleteAll__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Collection/DeleteAll.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Collection/DeleteAll.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Collection/DeleteAll',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Collection/meson.build b/gen/xyz/openbmc_project/Collection/meson.build
index 311d958..f89ea96 100644
--- a/gen/xyz/openbmc_project/Collection/meson.build
+++ b/gen/xyz/openbmc_project/Collection/meson.build
@@ -2,13 +2,13 @@
 subdir('DeleteAll')
 generated_others += custom_target(
     'xyz/openbmc_project/Collection/DeleteAll__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Collection/DeleteAll.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Collection/DeleteAll.interface.yaml',  ],
     output: [ 'DeleteAll.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Collection/DeleteAll',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/Callout/meson.build b/gen/xyz/openbmc_project/Common/Callout/meson.build
index 9eb3d8e..a8f8ce1 100644
--- a/gen/xyz/openbmc_project/Common/Callout/meson.build
+++ b/gen/xyz/openbmc_project/Common/Callout/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Callout__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/Callout.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/Callout.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/Callout',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/Device/meson.build b/gen/xyz/openbmc_project/Common/Device/meson.build
index 13af541..fa0979d 100644
--- a/gen/xyz/openbmc_project/Common/Device/meson.build
+++ b/gen/xyz/openbmc_project/Common/Device/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Device__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/Device.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/Device.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/Device',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/FactoryReset/meson.build b/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
index b59e1bc..03fc0ce 100644
--- a/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
+++ b/gen/xyz/openbmc_project/Common/FactoryReset/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/FactoryReset__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/FactoryReset',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/File/meson.build b/gen/xyz/openbmc_project/Common/File/meson.build
index c451dbb..1cc7907 100644
--- a/gen/xyz/openbmc_project/Common/File/meson.build
+++ b/gen/xyz/openbmc_project/Common/File/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/File__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/File.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/File.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/File',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/FilePath/meson.build b/gen/xyz/openbmc_project/Common/FilePath/meson.build
index 89088be..30a57db 100644
--- a/gen/xyz/openbmc_project/Common/FilePath/meson.build
+++ b/gen/xyz/openbmc_project/Common/FilePath/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/FilePath__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/FilePath',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/ObjectPath/meson.build b/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
index 7089992..2968f0b 100644
--- a/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
+++ b/gen/xyz/openbmc_project/Common/ObjectPath/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/ObjectPath__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/ObjectPath',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/Progress/meson.build b/gen/xyz/openbmc_project/Common/Progress/meson.build
index 8f290c0..b73d651 100644
--- a/gen/xyz/openbmc_project/Common/Progress/meson.build
+++ b/gen/xyz/openbmc_project/Common/Progress/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/Progress__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/Progress.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/Progress.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/Progress',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/TFTP/meson.build b/gen/xyz/openbmc_project/Common/TFTP/meson.build
index a2982a0..77925df 100644
--- a/gen/xyz/openbmc_project/Common/TFTP/meson.build
+++ b/gen/xyz/openbmc_project/Common/TFTP/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/TFTP__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/TFTP',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/UUID/meson.build b/gen/xyz/openbmc_project/Common/UUID/meson.build
index 451a711..5e9d070 100644
--- a/gen/xyz/openbmc_project/Common/UUID/meson.build
+++ b/gen/xyz/openbmc_project/Common/UUID/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common/UUID__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Common/UUID.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Common/UUID.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Common/UUID',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Common/meson.build b/gen/xyz/openbmc_project/Common/meson.build
index 3672dfe..39344cf 100644
--- a/gen/xyz/openbmc_project/Common/meson.build
+++ b/gen/xyz/openbmc_project/Common/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Common__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Callout')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/Callout__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/Callout.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/Callout.errors.yaml',  ],
     output: [ 'Callout.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/Callout',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('Device')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/Device__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/Device.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/Device.errors.yaml',  ],
     output: [ 'Device.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/Device',
     ],
 )
@@ -43,13 +43,13 @@
 subdir('FactoryReset')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/FactoryReset__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/FactoryReset.interface.yaml',  ],
     output: [ 'FactoryReset.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/FactoryReset',
     ],
 )
@@ -57,13 +57,13 @@
 subdir('File')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/File__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/File.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/File.errors.yaml',  ],
     output: [ 'File.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/File',
     ],
 )
@@ -71,13 +71,13 @@
 subdir('FilePath')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/FilePath__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/FilePath.interface.yaml',  ],
     output: [ 'FilePath.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/FilePath',
     ],
 )
@@ -85,13 +85,13 @@
 subdir('ObjectPath')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/ObjectPath__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/ObjectPath.interface.yaml',  ],
     output: [ 'ObjectPath.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/ObjectPath',
     ],
 )
@@ -99,13 +99,13 @@
 subdir('Progress')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/Progress__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/Progress.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/Progress.interface.yaml',  ],
     output: [ 'Progress.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/Progress',
     ],
 )
@@ -113,13 +113,13 @@
 subdir('TFTP')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/TFTP__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/TFTP.interface.yaml',  ],
     output: [ 'TFTP.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/TFTP',
     ],
 )
@@ -127,13 +127,13 @@
 subdir('UUID')
 generated_others += custom_target(
     'xyz/openbmc_project/Common/UUID__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Common/UUID.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Common/UUID.interface.yaml',  ],
     output: [ 'UUID.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Common/UUID',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Condition/Host/meson.build b/gen/xyz/openbmc_project/Condition/Host/meson.build
deleted file mode 100644
index 8523523..0000000
--- a/gen/xyz/openbmc_project/Condition/Host/meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated file; do not modify.
-generated_sources += custom_target(
-    'xyz/openbmc_project/Condition/Host__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/Condition/Host.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
-    command: [
-        sdbuspp_gen_meson_prog, '--command', 'cpp',
-        '--output', meson.current_build_dir(),
-        '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
-        'xyz/openbmc_project/Condition/Host',
-    ],
-)
-
diff --git a/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build b/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build
index 71a1423..7467b69 100644
--- a/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build
+++ b/gen/xyz/openbmc_project/Condition/HostFirmware/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Condition/HostFirmware__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Condition/HostFirmware.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Condition/HostFirmware.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Condition/HostFirmware',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Condition/meson.build b/gen/xyz/openbmc_project/Condition/meson.build
index b833f0f..c88975a 100644
--- a/gen/xyz/openbmc_project/Condition/meson.build
+++ b/gen/xyz/openbmc_project/Condition/meson.build
@@ -2,13 +2,13 @@
 subdir('HostFirmware')
 generated_others += custom_target(
     'xyz/openbmc_project/Condition/HostFirmware__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Condition/HostFirmware.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Condition/HostFirmware.interface.yaml',  ],
     output: [ 'HostFirmware.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Condition/HostFirmware',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build b/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build
index ba5b427..0320193 100644
--- a/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/Mode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/Mode__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Boot/Mode.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/Mode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/Mode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build b/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build
index c493cd6..6b3a9e5 100644
--- a/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/RebootAttempts/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/RebootAttempts__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Boot/RebootAttempts.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/RebootAttempts.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/RebootAttempts',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build b/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build
index 515ea2e..328cfca 100644
--- a/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/RebootPolicy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/RebootPolicy__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Boot/RebootPolicy.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/RebootPolicy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/RebootPolicy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Boot/Source/meson.build b/gen/xyz/openbmc_project/Control/Boot/Source/meson.build
index 4fc3289..7dad260 100644
--- a/gen/xyz/openbmc_project/Control/Boot/Source/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/Source/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/Source__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Boot/Source.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/Source.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/Source',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Boot/Type/meson.build b/gen/xyz/openbmc_project/Control/Boot/Type/meson.build
index cf14d57..545f7f3 100644
--- a/gen/xyz/openbmc_project/Control/Boot/Type/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/Type/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Boot/Type__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Boot/Type.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Boot/Type.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/Type',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Boot/meson.build b/gen/xyz/openbmc_project/Control/Boot/meson.build
index 7208563..0945964 100644
--- a/gen/xyz/openbmc_project/Control/Boot/meson.build
+++ b/gen/xyz/openbmc_project/Control/Boot/meson.build
@@ -2,13 +2,13 @@
 subdir('Mode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Boot/Mode__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Boot/Mode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Boot/Mode.interface.yaml',  ],
     output: [ 'Mode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/Mode',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('RebootAttempts')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Boot/RebootAttempts__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Boot/RebootAttempts.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Boot/RebootAttempts.interface.yaml',  ],
     output: [ 'RebootAttempts.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/RebootAttempts',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('RebootPolicy')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Boot/RebootPolicy__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Boot/RebootPolicy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Boot/RebootPolicy.interface.yaml',  ],
     output: [ 'RebootPolicy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/RebootPolicy',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('Source')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Boot/Source__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Boot/Source.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Boot/Source.interface.yaml',  ],
     output: [ 'Source.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/Source',
     ],
 )
@@ -58,13 +58,13 @@
 subdir('Type')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Boot/Type__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Boot/Type.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Boot/Type.interface.yaml',  ],
     output: [ 'Type.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Boot/Type',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/CFMLimit/meson.build b/gen/xyz/openbmc_project/Control/CFMLimit/meson.build
index b671685..773bc17 100644
--- a/gen/xyz/openbmc_project/Control/CFMLimit/meson.build
+++ b/gen/xyz/openbmc_project/Control/CFMLimit/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/CFMLimit__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/CFMLimit.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/CFMLimit.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/CFMLimit',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build b/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build
index 400aa37..eb80b77 100644
--- a/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build
+++ b/gen/xyz/openbmc_project/Control/ChassisCapabilities/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/ChassisCapabilities__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/ChassisCapabilities.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/ChassisCapabilities.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/ChassisCapabilities',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Device/meson.build b/gen/xyz/openbmc_project/Control/Device/meson.build
index a5d6bc2..8383b6d 100644
--- a/gen/xyz/openbmc_project/Control/Device/meson.build
+++ b/gen/xyz/openbmc_project/Control/Device/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Device__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Device.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Device.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Device',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/FanPwm/meson.build b/gen/xyz/openbmc_project/Control/FanPwm/meson.build
index aa34f97..69108f2 100644
--- a/gen/xyz/openbmc_project/Control/FanPwm/meson.build
+++ b/gen/xyz/openbmc_project/Control/FanPwm/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FanPwm__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/FanPwm.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/FanPwm.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/FanPwm',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build b/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build
index 4c3c208..ca4ae17 100644
--- a/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/Control/FanRedundancy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FanRedundancy__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/FanRedundancy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/FanRedundancy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/FanRedundancy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/FanSpeed/meson.build b/gen/xyz/openbmc_project/Control/FanSpeed/meson.build
index 1bab9e1..1bebda7 100644
--- a/gen/xyz/openbmc_project/Control/FanSpeed/meson.build
+++ b/gen/xyz/openbmc_project/Control/FanSpeed/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FanSpeed__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/FanSpeed.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/FanSpeed.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/FanSpeed',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/FieldMode/meson.build b/gen/xyz/openbmc_project/Control/FieldMode/meson.build
index 8c20eac..42605ec 100644
--- a/gen/xyz/openbmc_project/Control/FieldMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/FieldMode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/FieldMode__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/FieldMode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/FieldMode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/FieldMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Host/NMI/meson.build b/gen/xyz/openbmc_project/Control/Host/NMI/meson.build
index 98dda07..7a79ed8 100644
--- a/gen/xyz/openbmc_project/Control/Host/NMI/meson.build
+++ b/gen/xyz/openbmc_project/Control/Host/NMI/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Host/NMI__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Host/NMI.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Host/NMI.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Host/NMI',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build b/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build
index 880acd5..d387728 100644
--- a/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build
+++ b/gen/xyz/openbmc_project/Control/Host/TurboAllowed/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Host/TurboAllowed__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Host/TurboAllowed.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Host/TurboAllowed.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Host/TurboAllowed',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Host/meson.build b/gen/xyz/openbmc_project/Control/Host/meson.build
index 7da5ad7..8227a63 100644
--- a/gen/xyz/openbmc_project/Control/Host/meson.build
+++ b/gen/xyz/openbmc_project/Control/Host/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Host__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Host.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Host.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Host',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('NMI')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Host/NMI__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Host/NMI.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Host/NMI.interface.yaml',  ],
     output: [ 'NMI.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Host/NMI',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('TurboAllowed')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Host/TurboAllowed__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Host/TurboAllowed.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Host/TurboAllowed.interface.yaml',  ],
     output: [ 'TurboAllowed.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Host/TurboAllowed',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build b/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build
index afba373..b5d0094 100644
--- a/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build
+++ b/gen/xyz/openbmc_project/Control/MinimumShipLevel/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/MinimumShipLevel__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/MinimumShipLevel',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Mode/meson.build b/gen/xyz/openbmc_project/Control/Mode/meson.build
index ad9c502..0e942b2 100644
--- a/gen/xyz/openbmc_project/Control/Mode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Mode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Mode__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Mode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Mode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Mode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build b/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build
index fca8663..8a6795a 100644
--- a/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/ACPIPowerState/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/ACPIPowerState__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Power/ACPIPowerState.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/ACPIPowerState.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Power/ACPIPowerState',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Power/Cap/meson.build b/gen/xyz/openbmc_project/Control/Power/Cap/meson.build
index 124ac18..ee7aa60 100644
--- a/gen/xyz/openbmc_project/Control/Power/Cap/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/Cap/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/Cap__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Power/Cap.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/Cap.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Power/Cap',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Power/Mode/meson.build b/gen/xyz/openbmc_project/Control/Power/Mode/meson.build
index 4d53b8f..144d314 100644
--- a/gen/xyz/openbmc_project/Control/Power/Mode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/Mode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/Mode__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Power/Mode.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/Mode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Power/Mode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build b/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build
index f024caa..df49b2b 100644
--- a/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/RestorePolicy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Power/RestorePolicy__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Power/RestorePolicy.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/RestorePolicy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Power/RestorePolicy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Power/meson.build b/gen/xyz/openbmc_project/Control/Power/meson.build
index ba4b2b0..dbd3b40 100644
--- a/gen/xyz/openbmc_project/Control/Power/meson.build
+++ b/gen/xyz/openbmc_project/Control/Power/meson.build
@@ -2,13 +2,13 @@
 subdir('ACPIPowerState')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Power/ACPIPowerState__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Power/ACPIPowerState.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Power/ACPIPowerState.interface.yaml',  ],
     output: [ 'ACPIPowerState.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Power/ACPIPowerState',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Cap')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Power/Cap__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Power/Cap.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Power/Cap.interface.yaml',  ],
     output: [ 'Cap.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Power/Cap',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Mode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Power/Mode__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Power/Mode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Power/Mode.interface.yaml',  ],
     output: [ 'Mode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Power/Mode',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('RestorePolicy')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Power/RestorePolicy__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Power/RestorePolicy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Power/RestorePolicy.interface.yaml',  ],
     output: [ 'RestorePolicy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Power/RestorePolicy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build b/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build
index 15a67a7..f2d2d54 100644
--- a/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build
+++ b/gen/xyz/openbmc_project/Control/PowerSupplyAttributes/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/PowerSupplyAttributes__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/PowerSupplyAttributes.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/PowerSupplyAttributes.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/PowerSupplyAttributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build b/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build
index 5a60b65..0254ecd 100644
--- a/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/Control/PowerSupplyRedundancy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/PowerSupplyRedundancy__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/PowerSupplyRedundancy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/PowerSupplyRedundancy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/PowerSupplyRedundancy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build b/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build
index 1190df7..76466df 100644
--- a/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build
+++ b/gen/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Processor/CurrentOperatingConfig__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Processor/CurrentOperatingConfig.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Processor/CurrentOperatingConfig',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Processor/meson.build b/gen/xyz/openbmc_project/Control/Processor/meson.build
index 4e38f3e..fc32bf2 100644
--- a/gen/xyz/openbmc_project/Control/Processor/meson.build
+++ b/gen/xyz/openbmc_project/Control/Processor/meson.build
@@ -2,13 +2,13 @@
 subdir('CurrentOperatingConfig')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Processor/CurrentOperatingConfig__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Processor/CurrentOperatingConfig.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Processor/CurrentOperatingConfig.interface.yaml',  ],
     output: [ 'CurrentOperatingConfig.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Processor/CurrentOperatingConfig',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build b/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build
index 682e1cc..417fe6c 100644
--- a/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Security/RestrictionMode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Security/RestrictionMode__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Security/RestrictionMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build b/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build
index 4909b14..ba12bf1 100644
--- a/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/Security/SpecialMode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Security/SpecialMode__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Security/SpecialMode.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Security/SpecialMode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Security/SpecialMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Security/meson.build b/gen/xyz/openbmc_project/Control/Security/meson.build
index c57dc7d..89173be 100644
--- a/gen/xyz/openbmc_project/Control/Security/meson.build
+++ b/gen/xyz/openbmc_project/Control/Security/meson.build
@@ -2,13 +2,13 @@
 subdir('RestrictionMode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Security/RestrictionMode__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml',  ],
     output: [ 'RestrictionMode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Security/RestrictionMode',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('SpecialMode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Security/SpecialMode__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Security/SpecialMode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Security/SpecialMode.interface.yaml',  ],
     output: [ 'SpecialMode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Security/SpecialMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build b/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build
index 32ff8eb..58557bb 100644
--- a/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build
+++ b/gen/xyz/openbmc_project/Control/Service/Attributes/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Service/Attributes__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Service/Attributes.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Service/Attributes.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Service/Attributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build b/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build
index 11b0b09..1da1fc3 100644
--- a/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build
+++ b/gen/xyz/openbmc_project/Control/Service/SocketAttributes/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/Service/SocketAttributes__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/Service/SocketAttributes.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Service/SocketAttributes.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/Service/SocketAttributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/Service/meson.build b/gen/xyz/openbmc_project/Control/Service/meson.build
index aa27729..f186570 100644
--- a/gen/xyz/openbmc_project/Control/Service/meson.build
+++ b/gen/xyz/openbmc_project/Control/Service/meson.build
@@ -2,13 +2,13 @@
 subdir('Attributes')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Service/Attributes__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Service/Attributes.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Service/Attributes.interface.yaml',  ],
     output: [ 'Attributes.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Service/Attributes',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('SocketAttributes')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Service/SocketAttributes__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/Service/SocketAttributes.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/Service/SocketAttributes.interface.yaml',  ],
     output: [ 'SocketAttributes.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/Service/SocketAttributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build b/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build
index a3df802..b47cb59 100644
--- a/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build
+++ b/gen/xyz/openbmc_project/Control/TPM/Policy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/TPM/Policy__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Control/TPM/Policy.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Control/TPM/Policy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Control/TPM/Policy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/TPM/meson.build b/gen/xyz/openbmc_project/Control/TPM/meson.build
index 35c1252..5761da8 100644
--- a/gen/xyz/openbmc_project/Control/TPM/meson.build
+++ b/gen/xyz/openbmc_project/Control/TPM/meson.build
@@ -2,13 +2,13 @@
 subdir('Policy')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/TPM/Policy__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/TPM/Policy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/TPM/Policy.interface.yaml',  ],
     output: [ 'Policy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/TPM/Policy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/ThermalMode/meson.build b/gen/xyz/openbmc_project/Control/ThermalMode/meson.build
index 4b3150b..b2f0d40 100644
--- a/gen/xyz/openbmc_project/Control/ThermalMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/ThermalMode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/ThermalMode__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/ThermalMode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/ThermalMode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/ThermalMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build b/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build
index e6ac9a5..85222d8 100644
--- a/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build
+++ b/gen/xyz/openbmc_project/Control/VoltageRegulatorControl/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/VoltageRegulatorControl__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/VoltageRegulatorControl.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/VoltageRegulatorControl.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/VoltageRegulatorControl',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build b/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build
index 54aa9c2..b5172e9 100644
--- a/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build
+++ b/gen/xyz/openbmc_project/Control/VoltageRegulatorMode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Control/VoltageRegulatorMode__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Control/VoltageRegulatorMode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Control/VoltageRegulatorMode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Control/VoltageRegulatorMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Control/meson.build b/gen/xyz/openbmc_project/Control/meson.build
index c10c1c9..9d22099 100644
--- a/gen/xyz/openbmc_project/Control/meson.build
+++ b/gen/xyz/openbmc_project/Control/meson.build
@@ -3,13 +3,13 @@
 subdir('CFMLimit')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/CFMLimit__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/CFMLimit.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/CFMLimit.interface.yaml',  ],
     output: [ 'CFMLimit.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/CFMLimit',
     ],
 )
@@ -17,13 +17,13 @@
 subdir('ChassisCapabilities')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/ChassisCapabilities__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/ChassisCapabilities.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/ChassisCapabilities.interface.yaml',  ],
     output: [ 'ChassisCapabilities.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/ChassisCapabilities',
     ],
 )
@@ -31,13 +31,13 @@
 subdir('Device')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Device__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/Device.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/Device.errors.yaml',  ],
     output: [ 'Device.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/Device',
     ],
 )
@@ -45,13 +45,13 @@
 subdir('FanPwm')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/FanPwm__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/FanPwm.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/FanPwm.interface.yaml',  ],
     output: [ 'FanPwm.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/FanPwm',
     ],
 )
@@ -59,13 +59,13 @@
 subdir('FanRedundancy')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/FanRedundancy__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/FanRedundancy.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/FanRedundancy.interface.yaml',  ],
     output: [ 'FanRedundancy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/FanRedundancy',
     ],
 )
@@ -73,13 +73,13 @@
 subdir('FanSpeed')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/FanSpeed__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/FanSpeed.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/FanSpeed.interface.yaml',  ],
     output: [ 'FanSpeed.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/FanSpeed',
     ],
 )
@@ -87,13 +87,13 @@
 subdir('FieldMode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/FieldMode__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/FieldMode.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/FieldMode.interface.yaml',  ],
     output: [ 'FieldMode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/FieldMode',
     ],
 )
@@ -101,13 +101,13 @@
 subdir('Host')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Host__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/Host.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/Host.interface.yaml',  ],
     output: [ 'Host.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/Host',
     ],
 )
@@ -115,13 +115,13 @@
 subdir('MinimumShipLevel')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/MinimumShipLevel__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml',  ],
     output: [ 'MinimumShipLevel.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/MinimumShipLevel',
     ],
 )
@@ -129,13 +129,13 @@
 subdir('Mode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/Mode__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/Mode.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/Mode.interface.yaml',  ],
     output: [ 'Mode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/Mode',
     ],
 )
@@ -144,13 +144,13 @@
 subdir('PowerSupplyAttributes')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/PowerSupplyAttributes__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/PowerSupplyAttributes.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/PowerSupplyAttributes.interface.yaml',  ],
     output: [ 'PowerSupplyAttributes.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/PowerSupplyAttributes',
     ],
 )
@@ -158,13 +158,13 @@
 subdir('PowerSupplyRedundancy')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/PowerSupplyRedundancy__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/PowerSupplyRedundancy.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/PowerSupplyRedundancy.interface.yaml',  ],
     output: [ 'PowerSupplyRedundancy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/PowerSupplyRedundancy',
     ],
 )
@@ -176,13 +176,13 @@
 subdir('ThermalMode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/ThermalMode__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/ThermalMode.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/ThermalMode.interface.yaml',  ],
     output: [ 'ThermalMode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/ThermalMode',
     ],
 )
@@ -190,13 +190,13 @@
 subdir('VoltageRegulatorControl')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/VoltageRegulatorControl__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/VoltageRegulatorControl.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/VoltageRegulatorControl.interface.yaml',  ],
     output: [ 'VoltageRegulatorControl.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/VoltageRegulatorControl',
     ],
 )
@@ -204,13 +204,13 @@
 subdir('VoltageRegulatorMode')
 generated_others += custom_target(
     'xyz/openbmc_project/Control/VoltageRegulatorMode__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Control/VoltageRegulatorMode.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Control/VoltageRegulatorMode.interface.yaml',  ],
     output: [ 'VoltageRegulatorMode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Control/VoltageRegulatorMode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Dump/Create/meson.build b/gen/xyz/openbmc_project/Dump/Create/meson.build
index 9182876..6c6c05a 100644
--- a/gen/xyz/openbmc_project/Dump/Create/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Create/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Create__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Dump/Create.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Create.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Dump/Create',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build b/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
index fcbbe79..1c786a4 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/BMC/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry/BMC__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Dump/Entry/BMC.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/BMC.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Dump/Entry/BMC',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Dump/Entry/System/meson.build b/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
index 4478098..f37d15a 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/System/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry/System__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Dump/Entry/System.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Dump/Entry/System.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Dump/Entry/System',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Dump/Entry/meson.build b/gen/xyz/openbmc_project/Dump/Entry/meson.build
index 08ec6fc..38c780d 100644
--- a/gen/xyz/openbmc_project/Dump/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Dump/Entry/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/Entry__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Dump/Entry.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Dump/Entry',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('BMC')
 generated_others += custom_target(
     'xyz/openbmc_project/Dump/Entry/BMC__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Dump/Entry/BMC.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry/BMC.interface.yaml',  ],
     output: [ 'BMC.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Dump/Entry/BMC',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('System')
 generated_others += custom_target(
     'xyz/openbmc_project/Dump/Entry/System__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Dump/Entry/System.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Dump/Entry/System.interface.yaml',  ],
     output: [ 'System.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Dump/Entry/System',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Dump/NewDump/meson.build b/gen/xyz/openbmc_project/Dump/NewDump/meson.build
index f427934..9fdee32 100644
--- a/gen/xyz/openbmc_project/Dump/NewDump/meson.build
+++ b/gen/xyz/openbmc_project/Dump/NewDump/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Dump/NewDump__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Dump/NewDump.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Dump/NewDump.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Dump/NewDump',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Dump/meson.build b/gen/xyz/openbmc_project/Dump/meson.build
index e455ead..279903c 100644
--- a/gen/xyz/openbmc_project/Dump/meson.build
+++ b/gen/xyz/openbmc_project/Dump/meson.build
@@ -2,13 +2,13 @@
 subdir('Create')
 generated_others += custom_target(
     'xyz/openbmc_project/Dump/Create__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Dump/Create.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Dump/Create.interface.yaml',  ],
     output: [ 'Create.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Dump/Create',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Entry')
 generated_others += custom_target(
     'xyz/openbmc_project/Dump/Entry__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Dump/Entry.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Dump/Entry.interface.yaml',  ],
     output: [ 'Entry.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Dump/Entry',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('NewDump')
 generated_others += custom_target(
     'xyz/openbmc_project/Dump/NewDump__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Dump/NewDump.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Dump/NewDump.interface.yaml',  ],
     output: [ 'NewDump.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Dump/NewDump',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
index 6e980c7..f681fb0 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Asset/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Asset__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Asset',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
index e0e9c50..01a3790 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/AssetTag/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/AssetTag__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/AssetTag.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/AssetTag.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/AssetTag',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
index 4265e89..b8ec706 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/CLEI/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CLEI__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/CLEI.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CLEI.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/CLEI',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
index 0b9a1db..cae7a3d 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Cacheable/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Cacheable__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Cacheable',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
index 6c1e0e8..4b831bf 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Compatible/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Compatible__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/Compatible.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Compatible.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Compatible',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
index 0baa875..a2ad21a 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/CoolingType/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CoolingType__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/CoolingType',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
index 82ecea4..33d3b18 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/I2CDevice/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/I2CDevice__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/I2CDevice.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/I2CDevice.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/I2CDevice',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
index 58a22a7..55ab1e5 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/LocationCode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/LocationCode__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/LocationCode.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/LocationCode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/LocationCode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
index 38e8f33..085fb80 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/ManufacturerExt__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/ManufacturerExt.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/ManufacturerExt',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
index 0ac9785..9badab7 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
index 6932fd2..fbac039 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Replaceable/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Replaceable__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Replaceable',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
index da1a4bc..b9aab22 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/Revision/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Revision__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Revision',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
index 868b40f..ba95417 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
index a3b0b51..6cfe8e4 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/VendorInformation/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VendorInformation__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/VendorInformation',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
index b13ec58..a1927a8 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/VoltageControl/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VoltageControl__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/VoltageControl',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Decorator/meson.build b/gen/xyz/openbmc_project/Inventory/Decorator/meson.build
index 440c3b3..34d97cf 100644
--- a/gen/xyz/openbmc_project/Inventory/Decorator/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Decorator/meson.build
@@ -2,13 +2,13 @@
 subdir('Asset')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Asset__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml',  ],
     output: [ 'Asset.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Asset',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('AssetTag')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/AssetTag__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/AssetTag.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/AssetTag.interface.yaml',  ],
     output: [ 'AssetTag.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/AssetTag',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('CLEI')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CLEI__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/CLEI.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CLEI.interface.yaml',  ],
     output: [ 'CLEI.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/CLEI',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('Cacheable')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Cacheable__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml',  ],
     output: [ 'Cacheable.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Cacheable',
     ],
 )
@@ -58,13 +58,13 @@
 subdir('Compatible')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Compatible__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/Compatible.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Compatible.interface.yaml',  ],
     output: [ 'Compatible.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Compatible',
     ],
 )
@@ -72,13 +72,13 @@
 subdir('CoolingType')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/CoolingType__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml',  ],
     output: [ 'CoolingType.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/CoolingType',
     ],
 )
@@ -86,13 +86,13 @@
 subdir('I2CDevice')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/I2CDevice__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/I2CDevice.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/I2CDevice.interface.yaml',  ],
     output: [ 'I2CDevice.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/I2CDevice',
     ],
 )
@@ -100,13 +100,13 @@
 subdir('LocationCode')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/LocationCode__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/LocationCode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/LocationCode.interface.yaml',  ],
     output: [ 'LocationCode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/LocationCode',
     ],
 )
@@ -114,13 +114,13 @@
 subdir('ManufacturerExt')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/ManufacturerExt__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/ManufacturerExt.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/ManufacturerExt.interface.yaml',  ],
     output: [ 'ManufacturerExt.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/ManufacturerExt',
     ],
 )
@@ -128,13 +128,13 @@
 subdir('MeetsMinimumShipLevel')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml',  ],
     output: [ 'MeetsMinimumShipLevel.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel',
     ],
 )
@@ -142,13 +142,13 @@
 subdir('Replaceable')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Replaceable__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml',  ],
     output: [ 'Replaceable.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Replaceable',
     ],
 )
@@ -156,13 +156,13 @@
 subdir('Revision')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/Revision__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml',  ],
     output: [ 'Revision.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/Revision',
     ],
 )
@@ -170,13 +170,13 @@
 subdir('UniqueIdentifier')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier.interface.yaml',  ],
     output: [ 'UniqueIdentifier.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/UniqueIdentifier',
     ],
 )
@@ -184,13 +184,13 @@
 subdir('VendorInformation')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VendorInformation__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml',  ],
     output: [ 'VendorInformation.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/VendorInformation',
     ],
 )
@@ -198,13 +198,13 @@
 subdir('VoltageControl')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Decorator/VoltageControl__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml',  ],
     output: [ 'VoltageControl.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Decorator/VoltageControl',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
index 464eceb..be2d10a 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Accelerator/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Accelerator__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Accelerator.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Accelerator.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Accelerator',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
index ab6550e..429ab5f 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Battery/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Battery__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Battery.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Battery.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Battery',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
index fc381b7..459bcdb 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Bmc/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Bmc__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Bmc',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
index dd28de9..371e120 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/IOBoard/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/IOBoard__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Board/IOBoard',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
index 338c203..bb11790 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/Motherboard/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/Motherboard__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Board/Motherboard',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
index f590553..af1c582 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Board/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Board.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Board',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('IOBoard')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/IOBoard__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml',  ],
     output: [ 'IOBoard.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Board/IOBoard',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('Motherboard')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board/Motherboard__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml',  ],
     output: [ 'Motherboard.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Board/Motherboard',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
index e773185..3cada47 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Chassis/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Chassis__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Chassis',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
index 19bf3c7..a66ab63 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Connector/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Connector__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Connector.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Connector',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
index 9d64504..5d7e869 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
index f3eb3e8..25612ae 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Cpu/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Cpu',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('OperatingConfig')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig.interface.yaml',  ],
     output: [ 'OperatingConfig.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Cpu/OperatingConfig',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build b/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
index e2e68f9..df69308 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/CpuCore/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/CpuCore__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/CpuCore',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
index 1200d79..3ceeb93 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
index c77be51..79b2bef 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Dimm/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Dimm',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('MemoryLocation')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation.interface.yaml',  ],
     output: [ 'MemoryLocation.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Dimm/MemoryLocation',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build b/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
index 5a1de9a..c4ccb74 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/DiskBackplane/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/DiskBackplane__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/DiskBackplane',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
deleted file mode 100644
index 402efda..0000000
--- a/gen/xyz/openbmc_project/Inventory/Item/Drive/meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated file; do not modify.
-generated_sources += custom_target(
-    'xyz/openbmc_project/Inventory/Item/Drive__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Drive.interface.yaml',  ],
-    output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
-    command: [
-        sdbuspp_gen_meson_prog, '--command', 'cpp',
-        '--output', meson.current_build_dir(),
-        '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
-        'xyz/openbmc_project/Inventory/Item/Drive',
-    ],
-)
-
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
index 546c8bf..d0980af 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Ethernet/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Ethernet__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Ethernet',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build b/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
index 5a8ba4b..10f1ce7 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/FabricAdapter/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/FabricAdapter__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/FabricAdapter.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/FabricAdapter.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/FabricAdapter',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
index a8c1a03..92602ba 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Fan/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Fan__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Fan.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Fan',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
index 45256f2..12e8531 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Global/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Global__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Global.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Global.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Global',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build b/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
index 715d2bc..1970612 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/MemoryBuffer/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/MemoryBuffer__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/MemoryBuffer',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build b/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
index b9c3e1c..c06cdfa 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/NetworkInterface/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/NetworkInterface__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/NetworkInterface',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
index 55d1415..b4a7ead 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PCIeDevice/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeDevice__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PCIeDevice',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
index 93357dd..44c8e2e 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PCIeSlot/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeSlot__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PCIeSlot.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeSlot.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PCIeSlot',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
index 4da5656..69a9044 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Panel/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Panel__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Panel.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Panel',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
index 097a505..bbc1824 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
index 6db95f6..e107d4f 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
index 8d4c8d1..3546cb0 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
index 3663c3f..a380aad 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PersistentMemory/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Partition')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition.interface.yaml',  ],
     output: [ 'Partition.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory/Partition',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('PowerManagementPolicy')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy.interface.yaml',  ],
     output: [ 'PowerManagementPolicy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory/PowerManagementPolicy',
     ],
 )
@@ -43,13 +43,13 @@
 subdir('SecurityCapabilities')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities.interface.yaml',  ],
     output: [ 'SecurityCapabilities.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory/SecurityCapabilities',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build b/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
index cfb7476..1b740e5 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/PowerSupply/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/PowerSupply__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PowerSupply',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
index b10bc55..23b5a8f 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Rotor/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Rotor__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Rotor.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Rotor.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Rotor',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build b/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
index 728d8e3..15c6c4a 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/StorageController/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/StorageController__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/StorageController',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/System/meson.build b/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
index 1c70dee..22adb45 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/System/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/System__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/System.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/System.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/System',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
index 3ebd9b1..d4d003b 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Tpm/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Tpm__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Tpm',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
index 6d78141..075ae2c 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/Vrm/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item/Vrm__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Vrm',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Item/meson.build b/gen/xyz/openbmc_project/Inventory/Item/meson.build
index 652b4a3..c301158 100644
--- a/gen/xyz/openbmc_project/Inventory/Item/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Item/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Item__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Accelerator')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Accelerator__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Accelerator.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Accelerator.interface.yaml',  ],
     output: [ 'Accelerator.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Accelerator',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('Battery')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Battery__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Battery.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Battery.interface.yaml',  ],
     output: [ 'Battery.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Battery',
     ],
 )
@@ -43,13 +43,13 @@
 subdir('Bmc')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Bmc__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml',  ],
     output: [ 'Bmc.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Bmc',
     ],
 )
@@ -57,13 +57,13 @@
 subdir('Board')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Board__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Board.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Board.interface.yaml',  ],
     output: [ 'Board.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Board',
     ],
 )
@@ -71,13 +71,13 @@
 subdir('Chassis')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Chassis__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml',  ],
     output: [ 'Chassis.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Chassis',
     ],
 )
@@ -85,13 +85,13 @@
 subdir('Connector')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Connector__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Connector.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml',  ],
     output: [ 'Connector.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Connector',
     ],
 )
@@ -99,13 +99,13 @@
 subdir('Cpu')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Cpu__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml',  ],
     output: [ 'Cpu.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Cpu',
     ],
 )
@@ -113,13 +113,13 @@
 subdir('CpuCore')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/CpuCore__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml',  ],
     output: [ 'CpuCore.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/CpuCore',
     ],
 )
@@ -127,13 +127,13 @@
 subdir('Dimm')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Dimm__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml',  ],
     output: [ 'Dimm.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Dimm',
     ],
 )
@@ -141,41 +141,27 @@
 subdir('DiskBackplane')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/DiskBackplane__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml',  ],
     output: [ 'DiskBackplane.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/DiskBackplane',
     ],
 )
 
-subdir('Drive')
-generated_others += custom_target(
-    'xyz/openbmc_project/Inventory/Item/Drive__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Drive.interface.yaml',  ],
-    output: [ 'Drive.md' ],
-    command: [
-        sdbuspp_gen_meson_prog, '--command', 'markdown',
-        '--output', meson.current_build_dir(),
-        '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
-        'xyz/openbmc_project/Inventory/Item/Drive',
-    ],
-)
-
 subdir('Ethernet')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Ethernet__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml',  ],
     output: [ 'Ethernet.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Ethernet',
     ],
 )
@@ -183,13 +169,13 @@
 subdir('FabricAdapter')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/FabricAdapter__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/FabricAdapter.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/FabricAdapter.interface.yaml',  ],
     output: [ 'FabricAdapter.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/FabricAdapter',
     ],
 )
@@ -197,13 +183,13 @@
 subdir('Fan')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Fan__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Fan.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml',  ],
     output: [ 'Fan.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Fan',
     ],
 )
@@ -211,13 +197,13 @@
 subdir('Global')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Global__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Global.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Global.interface.yaml',  ],
     output: [ 'Global.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Global',
     ],
 )
@@ -225,13 +211,13 @@
 subdir('MemoryBuffer')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/MemoryBuffer__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml',  ],
     output: [ 'MemoryBuffer.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/MemoryBuffer',
     ],
 )
@@ -239,13 +225,13 @@
 subdir('NetworkInterface')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/NetworkInterface__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml',  ],
     output: [ 'NetworkInterface.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/NetworkInterface',
     ],
 )
@@ -253,13 +239,13 @@
 subdir('PCIeDevice')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeDevice__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeDevice.interface.yaml',  ],
     output: [ 'PCIeDevice.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PCIeDevice',
     ],
 )
@@ -267,13 +253,13 @@
 subdir('PCIeSlot')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PCIeSlot__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/PCIeSlot.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/PCIeSlot.interface.yaml',  ],
     output: [ 'PCIeSlot.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PCIeSlot',
     ],
 )
@@ -281,13 +267,13 @@
 subdir('Panel')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Panel__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Panel.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml',  ],
     output: [ 'Panel.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Panel',
     ],
 )
@@ -295,13 +281,13 @@
 subdir('PersistentMemory')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PersistentMemory__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/PersistentMemory.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/PersistentMemory.interface.yaml',  ],
     output: [ 'PersistentMemory.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PersistentMemory',
     ],
 )
@@ -309,13 +295,13 @@
 subdir('PowerSupply')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/PowerSupply__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml',  ],
     output: [ 'PowerSupply.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/PowerSupply',
     ],
 )
@@ -323,13 +309,13 @@
 subdir('Rotor')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Rotor__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Rotor.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Rotor.interface.yaml',  ],
     output: [ 'Rotor.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Rotor',
     ],
 )
@@ -337,13 +323,13 @@
 subdir('StorageController')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/StorageController__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml',  ],
     output: [ 'StorageController.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/StorageController',
     ],
 )
@@ -351,13 +337,13 @@
 subdir('System')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/System__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/System.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/System.interface.yaml',  ],
     output: [ 'System.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/System',
     ],
 )
@@ -365,13 +351,13 @@
 subdir('Tpm')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Tpm__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml',  ],
     output: [ 'Tpm.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Tpm',
     ],
 )
@@ -379,13 +365,13 @@
 subdir('Vrm')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item/Vrm__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml',  ],
     output: [ 'Vrm.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Item/Vrm',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Manager/meson.build b/gen/xyz/openbmc_project/Inventory/Manager/meson.build
index 0239e85..9ad9d91 100644
--- a/gen/xyz/openbmc_project/Inventory/Manager/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Manager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Manager__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Inventory/Manager.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Manager.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Inventory/Manager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
index 730cbe1..0d3260f 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/Entity/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/Entity__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Source/PLDM/Entity.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/Entity.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Source/PLDM/Entity',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
index ac925bc..f8c0c9b 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/FRU/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/FRU__cpp'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/Inventory/Source/PLDM/FRU.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/FRU.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Source/PLDM/FRU',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/Source/PLDM/meson.build b/gen/xyz/openbmc_project/Inventory/Source/PLDM/meson.build
index 8ae2387..d96d11e 100644
--- a/gen/xyz/openbmc_project/Inventory/Source/PLDM/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/Source/PLDM/meson.build
@@ -2,13 +2,13 @@
 subdir('Entity')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/Entity__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Source/PLDM/Entity.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/Entity.interface.yaml',  ],
     output: [ 'Entity.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Source/PLDM/Entity',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('FRU')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Source/PLDM/FRU__markdown'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Inventory/Source/PLDM/FRU.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Source/PLDM/FRU.interface.yaml',  ],
     output: [ 'FRU.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Inventory/Source/PLDM/FRU',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Inventory/meson.build b/gen/xyz/openbmc_project/Inventory/meson.build
index 5534cd5..9fce291 100644
--- a/gen/xyz/openbmc_project/Inventory/meson.build
+++ b/gen/xyz/openbmc_project/Inventory/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Inventory__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Inventory.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Inventory.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Inventory',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Item')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Item__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Inventory/Item.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Inventory/Item.interface.yaml',  ],
     output: [ 'Item.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Inventory/Item',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Manager')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory/Manager__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Inventory/Manager.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Inventory/Manager.interface.yaml',  ],
     output: [ 'Manager.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Inventory/Manager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Ipmi/SOL/meson.build b/gen/xyz/openbmc_project/Ipmi/SOL/meson.build
index 8037552..a791dab 100644
--- a/gen/xyz/openbmc_project/Ipmi/SOL/meson.build
+++ b/gen/xyz/openbmc_project/Ipmi/SOL/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Ipmi/SOL__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Ipmi/SOL.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Ipmi/SOL.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Ipmi/SOL',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build b/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build
index 74533b3..fbcc4d8 100644
--- a/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build
+++ b/gen/xyz/openbmc_project/Ipmi/SessionInfo/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Ipmi/SessionInfo__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Ipmi/SessionInfo',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Ipmi/meson.build b/gen/xyz/openbmc_project/Ipmi/meson.build
index 956539a..35e3850 100644
--- a/gen/xyz/openbmc_project/Ipmi/meson.build
+++ b/gen/xyz/openbmc_project/Ipmi/meson.build
@@ -2,13 +2,13 @@
 subdir('SOL')
 generated_others += custom_target(
     'xyz/openbmc_project/Ipmi/SOL__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Ipmi/SOL.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Ipmi/SOL.interface.yaml',  ],
     output: [ 'SOL.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Ipmi/SOL',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('SessionInfo')
 generated_others += custom_target(
     'xyz/openbmc_project/Ipmi/SessionInfo__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml',  ],
     output: [ 'SessionInfo.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Ipmi/SessionInfo',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Led/Group/meson.build b/gen/xyz/openbmc_project/Led/Group/meson.build
index c2cb124..4d2cd86 100644
--- a/gen/xyz/openbmc_project/Led/Group/meson.build
+++ b/gen/xyz/openbmc_project/Led/Group/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Led/Group__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Led/Group.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Led/Group.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Led/Group',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Led/Physical/meson.build b/gen/xyz/openbmc_project/Led/Physical/meson.build
index 10eb637..f4ddd40 100644
--- a/gen/xyz/openbmc_project/Led/Physical/meson.build
+++ b/gen/xyz/openbmc_project/Led/Physical/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Led/Physical__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Led/Physical.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Led/Physical.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Led/Physical',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Led/meson.build b/gen/xyz/openbmc_project/Led/meson.build
index 1ecfeca..fbaf76a 100644
--- a/gen/xyz/openbmc_project/Led/meson.build
+++ b/gen/xyz/openbmc_project/Led/meson.build
@@ -2,13 +2,13 @@
 subdir('Group')
 generated_others += custom_target(
     'xyz/openbmc_project/Led/Group__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Led/Group.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Led/Group.interface.yaml',  ],
     output: [ 'Group.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Led/Group',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Physical')
 generated_others += custom_target(
     'xyz/openbmc_project/Led/Physical__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Led/Physical.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Led/Physical.interface.yaml',  ],
     output: [ 'Physical.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Led/Physical',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/Create/meson.build b/gen/xyz/openbmc_project/Logging/Create/meson.build
index d96af89..f21db54 100644
--- a/gen/xyz/openbmc_project/Logging/Create/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Create/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Create__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/Create.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Create.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/Create',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/Entry/meson.build b/gen/xyz/openbmc_project/Logging/Entry/meson.build
index 364c935..f3cfc6f 100644
--- a/gen/xyz/openbmc_project/Logging/Entry/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Entry/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Entry__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/Entry.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Entry.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/Entry',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build b/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build
index 8b833af..8011688 100644
--- a/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build
+++ b/gen/xyz/openbmc_project/Logging/ErrorBlocksTransition/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/ErrorBlocksTransition__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/ErrorBlocksTransition.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/ErrorBlocksTransition.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/ErrorBlocksTransition',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/Event/meson.build b/gen/xyz/openbmc_project/Logging/Event/meson.build
index 6a0e0e1..09c1d6b 100644
--- a/gen/xyz/openbmc_project/Logging/Event/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Event/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Event__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/Event.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Event.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/Event',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/IPMI/meson.build b/gen/xyz/openbmc_project/Logging/IPMI/meson.build
index 8b05650..9fabe6f 100644
--- a/gen/xyz/openbmc_project/Logging/IPMI/meson.build
+++ b/gen/xyz/openbmc_project/Logging/IPMI/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/IPMI__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/IPMI.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/IPMI.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/IPMI',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/SEL/meson.build b/gen/xyz/openbmc_project/Logging/SEL/meson.build
index 4ee54bb..4f7caba 100644
--- a/gen/xyz/openbmc_project/Logging/SEL/meson.build
+++ b/gen/xyz/openbmc_project/Logging/SEL/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/SEL__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/SEL.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/SEL.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/SEL',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/Settings/meson.build b/gen/xyz/openbmc_project/Logging/Settings/meson.build
index b7bca9f..96ef3b5 100644
--- a/gen/xyz/openbmc_project/Logging/Settings/meson.build
+++ b/gen/xyz/openbmc_project/Logging/Settings/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Logging/Settings__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Logging/Settings.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Logging/Settings.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Logging/Settings',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Logging/meson.build b/gen/xyz/openbmc_project/Logging/meson.build
index e0b0ced..d4affee 100644
--- a/gen/xyz/openbmc_project/Logging/meson.build
+++ b/gen/xyz/openbmc_project/Logging/meson.build
@@ -2,13 +2,13 @@
 subdir('Create')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/Create__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/Create.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/Create.interface.yaml',  ],
     output: [ 'Create.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/Create',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Entry')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/Entry__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/Entry.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/Entry.interface.yaml',  ],
     output: [ 'Entry.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/Entry',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('ErrorBlocksTransition')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/ErrorBlocksTransition__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/ErrorBlocksTransition.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/ErrorBlocksTransition.interface.yaml',  ],
     output: [ 'ErrorBlocksTransition.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/ErrorBlocksTransition',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('Event')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/Event__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/Event.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/Event.interface.yaml',  ],
     output: [ 'Event.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/Event',
     ],
 )
@@ -58,13 +58,13 @@
 subdir('IPMI')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/IPMI__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/IPMI.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/IPMI.interface.yaml',  ],
     output: [ 'IPMI.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/IPMI',
     ],
 )
@@ -72,13 +72,13 @@
 subdir('SEL')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/SEL__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/SEL.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/SEL.errors.yaml',  ],
     output: [ 'SEL.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/SEL',
     ],
 )
@@ -86,13 +86,13 @@
 subdir('Settings')
 generated_others += custom_target(
     'xyz/openbmc_project/Logging/Settings__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Logging/Settings.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Logging/Settings.interface.yaml',  ],
     output: [ 'Settings.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Logging/Settings',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build b/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build
index e2d81e6..9f0f250 100644
--- a/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build
+++ b/gen/xyz/openbmc_project/Memory/MemoryECC/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Memory/MemoryECC__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Memory/MemoryECC.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Memory/MemoryECC.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Memory/MemoryECC',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Memory/meson.build b/gen/xyz/openbmc_project/Memory/meson.build
index c8f59f9..ab615c6 100644
--- a/gen/xyz/openbmc_project/Memory/meson.build
+++ b/gen/xyz/openbmc_project/Memory/meson.build
@@ -2,13 +2,13 @@
 subdir('MemoryECC')
 generated_others += custom_target(
     'xyz/openbmc_project/Memory/MemoryECC__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Memory/MemoryECC.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Memory/MemoryECC.interface.yaml',  ],
     output: [ 'MemoryECC.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Memory/MemoryECC',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/Client/meson.build b/gen/xyz/openbmc_project/Network/Client/meson.build
index 400f2b0..b996780 100644
--- a/gen/xyz/openbmc_project/Network/Client/meson.build
+++ b/gen/xyz/openbmc_project/Network/Client/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Client__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/Client.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/Client.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/Client',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build b/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build
index f477c58..28f248e 100644
--- a/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build
+++ b/gen/xyz/openbmc_project/Network/DHCPConfiguration/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/DHCPConfiguration__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/DHCPConfiguration.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/DHCPConfiguration.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/DHCPConfiguration',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build b/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build
index 8a40e4e..2af5c0c 100644
--- a/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build
+++ b/gen/xyz/openbmc_project/Network/EthernetInterface/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/EthernetInterface__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/EthernetInterface.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/EthernetInterface.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/EthernetInterface',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build b/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build
index 058ff43..2f2c3b6 100644
--- a/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build
+++ b/gen/xyz/openbmc_project/Network/Experimental/Bond/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Experimental/Bond__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Network/Experimental/Bond.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Experimental/Bond.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Network/Experimental/Bond',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build b/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build
index 9e2be77..e0730ed 100644
--- a/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build
+++ b/gen/xyz/openbmc_project/Network/Experimental/Tunnel/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Experimental/Tunnel__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Network/Experimental/Tunnel.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Experimental/Tunnel.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Network/Experimental/Tunnel',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/Experimental/meson.build b/gen/xyz/openbmc_project/Network/Experimental/meson.build
index 7d9fb91..a2a7074 100644
--- a/gen/xyz/openbmc_project/Network/Experimental/meson.build
+++ b/gen/xyz/openbmc_project/Network/Experimental/meson.build
@@ -2,13 +2,13 @@
 subdir('Bond')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/Experimental/Bond__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/Experimental/Bond.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/Experimental/Bond.interface.yaml',  ],
     output: [ 'Bond.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/Experimental/Bond',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Tunnel')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/Experimental/Tunnel__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/Experimental/Tunnel.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/Experimental/Tunnel.interface.yaml',  ],
     output: [ 'Tunnel.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/Experimental/Tunnel',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/IP/meson.build b/gen/xyz/openbmc_project/Network/IP/meson.build
index eaea766..46146a6 100644
--- a/gen/xyz/openbmc_project/Network/IP/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/IP__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/IP.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/IP.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/IP',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/MACAddress/meson.build b/gen/xyz/openbmc_project/Network/MACAddress/meson.build
index 172bd6f..5275519 100644
--- a/gen/xyz/openbmc_project/Network/MACAddress/meson.build
+++ b/gen/xyz/openbmc_project/Network/MACAddress/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/MACAddress__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/MACAddress.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/MACAddress.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/MACAddress',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
index 1656325..e375aa7 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/Neighbor__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/Neighbor.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/Neighbor.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/Neighbor',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build b/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build
index 0b0fd5a..a2cb126 100644
--- a/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build
+++ b/gen/xyz/openbmc_project/Network/SystemConfiguration/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/SystemConfiguration__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/SystemConfiguration.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/SystemConfiguration.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/SystemConfiguration',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/VLAN/meson.build b/gen/xyz/openbmc_project/Network/VLAN/meson.build
index ec213a2..369a65d 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Network/VLAN__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Network/VLAN.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Network/VLAN.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Network/VLAN',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Network/meson.build b/gen/xyz/openbmc_project/Network/meson.build
index 7110849..be23264 100644
--- a/gen/xyz/openbmc_project/Network/meson.build
+++ b/gen/xyz/openbmc_project/Network/meson.build
@@ -2,13 +2,13 @@
 subdir('Client')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/Client__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/Client.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/Client.interface.yaml',  ],
     output: [ 'Client.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/Client',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('DHCPConfiguration')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/DHCPConfiguration__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/DHCPConfiguration.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/DHCPConfiguration.interface.yaml',  ],
     output: [ 'DHCPConfiguration.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/DHCPConfiguration',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('EthernetInterface')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/EthernetInterface__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/EthernetInterface.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/EthernetInterface.interface.yaml',  ],
     output: [ 'EthernetInterface.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/EthernetInterface',
     ],
 )
@@ -45,13 +45,13 @@
 subdir('IP')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/IP__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/IP.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/IP.interface.yaml',  ],
     output: [ 'IP.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/IP',
     ],
 )
@@ -59,13 +59,13 @@
 subdir('MACAddress')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/MACAddress__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/MACAddress.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/MACAddress.interface.yaml',  ],
     output: [ 'MACAddress.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/MACAddress',
     ],
 )
@@ -73,13 +73,13 @@
 subdir('Neighbor')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/Neighbor__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/Neighbor.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/Neighbor.interface.yaml',  ],
     output: [ 'Neighbor.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/Neighbor',
     ],
 )
@@ -87,13 +87,13 @@
 subdir('SystemConfiguration')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/SystemConfiguration__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/SystemConfiguration.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/SystemConfiguration.interface.yaml',  ],
     output: [ 'SystemConfiguration.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/SystemConfiguration',
     ],
 )
@@ -101,13 +101,13 @@
 subdir('VLAN')
 generated_others += custom_target(
     'xyz/openbmc_project/Network/VLAN__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Network/VLAN.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Network/VLAN.interface.yaml',  ],
     output: [ 'VLAN.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Network/VLAN',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Nvme/Status/meson.build b/gen/xyz/openbmc_project/Nvme/Status/meson.build
index 9a809ae..30a14ea 100644
--- a/gen/xyz/openbmc_project/Nvme/Status/meson.build
+++ b/gen/xyz/openbmc_project/Nvme/Status/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Nvme/Status__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Nvme/Status.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Nvme/Status.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Nvme/Status',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Nvme/meson.build b/gen/xyz/openbmc_project/Nvme/meson.build
index 61cbe76..26b3850 100644
--- a/gen/xyz/openbmc_project/Nvme/meson.build
+++ b/gen/xyz/openbmc_project/Nvme/meson.build
@@ -2,13 +2,13 @@
 subdir('Status')
 generated_others += custom_target(
     'xyz/openbmc_project/Nvme/Status__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Nvme/Status.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Nvme/Status.interface.yaml',  ],
     output: [ 'Status.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Nvme/Status',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Object/Delete/meson.build b/gen/xyz/openbmc_project/Object/Delete/meson.build
index 393ecd6..6fa374a 100644
--- a/gen/xyz/openbmc_project/Object/Delete/meson.build
+++ b/gen/xyz/openbmc_project/Object/Delete/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Object/Delete__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Object/Delete.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Object/Delete.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Object/Delete',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Object/Enable/meson.build b/gen/xyz/openbmc_project/Object/Enable/meson.build
index f0b392c..5c5c815 100644
--- a/gen/xyz/openbmc_project/Object/Enable/meson.build
+++ b/gen/xyz/openbmc_project/Object/Enable/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Object/Enable__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Object/Enable.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Object/Enable.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Object/Enable',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Object/meson.build b/gen/xyz/openbmc_project/Object/meson.build
index 4f8608e..617ec62 100644
--- a/gen/xyz/openbmc_project/Object/meson.build
+++ b/gen/xyz/openbmc_project/Object/meson.build
@@ -2,13 +2,13 @@
 subdir('Delete')
 generated_others += custom_target(
     'xyz/openbmc_project/Object/Delete__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Object/Delete.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Object/Delete.interface.yaml',  ],
     output: [ 'Delete.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Object/Delete',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Enable')
 generated_others += custom_target(
     'xyz/openbmc_project/Object/Enable__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Object/Enable.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Object/Enable.interface.yaml',  ],
     output: [ 'Enable.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Object/Enable',
     ],
 )
diff --git a/gen/xyz/openbmc_project/ObjectMapper/meson.build b/gen/xyz/openbmc_project/ObjectMapper/meson.build
index dfae5d0..8bda1b2 100644
--- a/gen/xyz/openbmc_project/ObjectMapper/meson.build
+++ b/gen/xyz/openbmc_project/ObjectMapper/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/ObjectMapper__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/ObjectMapper.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/ObjectMapper.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/ObjectMapper',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PFR/Attributes/meson.build b/gen/xyz/openbmc_project/PFR/Attributes/meson.build
index fa67cbc..fdf58ee 100644
--- a/gen/xyz/openbmc_project/PFR/Attributes/meson.build
+++ b/gen/xyz/openbmc_project/PFR/Attributes/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/PFR/Attributes__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/PFR/Attributes.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/PFR/Attributes.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/PFR/Attributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PFR/meson.build b/gen/xyz/openbmc_project/PFR/meson.build
index f51b885..e8cc4d7 100644
--- a/gen/xyz/openbmc_project/PFR/meson.build
+++ b/gen/xyz/openbmc_project/PFR/meson.build
@@ -2,13 +2,13 @@
 subdir('Attributes')
 generated_others += custom_target(
     'xyz/openbmc_project/PFR/Attributes__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/PFR/Attributes.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/PFR/Attributes.interface.yaml',  ],
     output: [ 'Attributes.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/PFR/Attributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PLDM/Event/meson.build b/gen/xyz/openbmc_project/PLDM/Event/meson.build
index 92fa321..b8efc3b 100644
--- a/gen/xyz/openbmc_project/PLDM/Event/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Event/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/Event__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/PLDM/Event.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/Event.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/PLDM/Event',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PLDM/PDR/meson.build b/gen/xyz/openbmc_project/PLDM/PDR/meson.build
index ff5790e..693220b 100644
--- a/gen/xyz/openbmc_project/PLDM/PDR/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/PDR/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/PDR__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/PLDM/PDR.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/PDR.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/PLDM/PDR',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build b/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build
index 717cd0d..13c7193 100644
--- a/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR__cpp'.underscorify(),
-    input: [ '../../../../../../../../xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR.interface.yaml',  ],
+    input: [ '../../../../../../../../yaml/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../../yaml',
         'xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/meson.build b/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/meson.build
index f24565f..98ccacf 100644
--- a/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Provider/Certs/Authority/meson.build
@@ -2,13 +2,13 @@
 subdir('CSR')
 generated_others += custom_target(
     'xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR__markdown'.underscorify(),
-    input: [ '../../../../../../../xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR.interface.yaml',  ],
+    input: [ '../../../../../../../yaml/xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR.interface.yaml',  ],
     output: [ 'CSR.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../../yaml',
         'xyz/openbmc_project/PLDM/Provider/Certs/Authority/CSR',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PLDM/Requester/meson.build b/gen/xyz/openbmc_project/PLDM/Requester/meson.build
index 54025c5..4b3ba87 100644
--- a/gen/xyz/openbmc_project/PLDM/Requester/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/Requester/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/PLDM/Requester__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/PLDM/Requester.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/Requester.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/PLDM/Requester',
     ],
 )
diff --git a/gen/xyz/openbmc_project/PLDM/meson.build b/gen/xyz/openbmc_project/PLDM/meson.build
index 7897cad..2be636c 100644
--- a/gen/xyz/openbmc_project/PLDM/meson.build
+++ b/gen/xyz/openbmc_project/PLDM/meson.build
@@ -2,13 +2,13 @@
 subdir('Event')
 generated_others += custom_target(
     'xyz/openbmc_project/PLDM/Event__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/PLDM/Event.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/PLDM/Event.interface.yaml',  ],
     output: [ 'Event.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/PLDM/Event',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('PDR')
 generated_others += custom_target(
     'xyz/openbmc_project/PLDM/PDR__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/PLDM/PDR.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/PLDM/PDR.interface.yaml',  ],
     output: [ 'PDR.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/PLDM/PDR',
     ],
 )
@@ -31,13 +31,13 @@
 subdir('Requester')
 generated_others += custom_target(
     'xyz/openbmc_project/PLDM/Requester__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/PLDM/Requester.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/PLDM/Requester.interface.yaml',  ],
     output: [ 'Requester.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/PLDM/Requester',
     ],
 )
diff --git a/gen/xyz/openbmc_project/ScheduledTime/meson.build b/gen/xyz/openbmc_project/ScheduledTime/meson.build
index a3abef3..d6ae865 100644
--- a/gen/xyz/openbmc_project/ScheduledTime/meson.build
+++ b/gen/xyz/openbmc_project/ScheduledTime/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/ScheduledTime__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/ScheduledTime.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/ScheduledTime.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/ScheduledTime',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Device/meson.build b/gen/xyz/openbmc_project/Sensor/Device/meson.build
index 225f2c6..4959e65 100644
--- a/gen/xyz/openbmc_project/Sensor/Device/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Device/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Device__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Device.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Device.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Device',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build
index 23fcad6..69d6dbe 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/Critical/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/Critical__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/Critical',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build
index f067125..0555360 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/HardShutdown/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/HardShutdown__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Sensor/Threshold/HardShutdown.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/HardShutdown.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/HardShutdown',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build
index 9dd9ec0..051c32b 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/PerformanceLoss__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Sensor/Threshold/PerformanceLoss.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/PerformanceLoss',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build
index 5e0f106..d051c32 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/SoftShutdown/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/SoftShutdown__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Sensor/Threshold/SoftShutdown.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/SoftShutdown.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/SoftShutdown',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build
index 73142df..b75757c 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/Warning/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/Warning__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/Warning',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Threshold/meson.build b/gen/xyz/openbmc_project/Sensor/Threshold/meson.build
index bf16ddd..a0c182d 100644
--- a/gen/xyz/openbmc_project/Sensor/Threshold/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Threshold/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Threshold__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Threshold.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Threshold.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Critical')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/Critical__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml',  ],
     output: [ 'Critical.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/Critical',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('HardShutdown')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/HardShutdown__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Threshold/HardShutdown.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/HardShutdown.interface.yaml',  ],
     output: [ 'HardShutdown.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/HardShutdown',
     ],
 )
@@ -43,13 +43,13 @@
 subdir('PerformanceLoss')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/PerformanceLoss__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Threshold/PerformanceLoss.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/PerformanceLoss.interface.yaml',  ],
     output: [ 'PerformanceLoss.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/PerformanceLoss',
     ],
 )
@@ -57,13 +57,13 @@
 subdir('SoftShutdown')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/SoftShutdown__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Threshold/SoftShutdown.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/SoftShutdown.interface.yaml',  ],
     output: [ 'SoftShutdown.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/SoftShutdown',
     ],
 )
@@ -71,13 +71,13 @@
 subdir('Warning')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Threshold/Warning__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml',  ],
     output: [ 'Warning.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold/Warning',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/Value/meson.build b/gen/xyz/openbmc_project/Sensor/Value/meson.build
index e9b44df..e29d479 100644
--- a/gen/xyz/openbmc_project/Sensor/Value/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/Value/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Sensor/Value__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Sensor/Value.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Sensor/Value.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Sensor/Value',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Sensor/meson.build b/gen/xyz/openbmc_project/Sensor/meson.build
index 683d7cd..4e899bd 100644
--- a/gen/xyz/openbmc_project/Sensor/meson.build
+++ b/gen/xyz/openbmc_project/Sensor/meson.build
@@ -2,13 +2,13 @@
 subdir('Device')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Device__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Sensor/Device.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Sensor/Device.errors.yaml',  ],
     output: [ 'Device.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Sensor/Device',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Threshold')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Threshold__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Sensor/Threshold.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Sensor/Threshold.errors.yaml',  ],
     output: [ 'Threshold.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Sensor/Threshold',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Value')
 generated_others += custom_target(
     'xyz/openbmc_project/Sensor/Value__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Sensor/Value.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Sensor/Value.interface.yaml',  ],
     output: [ 'Value.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Sensor/Value',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build b/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
index 699bc67..77f5324 100644
--- a/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
+++ b/gen/xyz/openbmc_project/Smbios/MDR_V2/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Smbios/MDR_V2__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Smbios/MDR_V2',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Smbios/meson.build b/gen/xyz/openbmc_project/Smbios/meson.build
index 215011b..0f71b10 100644
--- a/gen/xyz/openbmc_project/Smbios/meson.build
+++ b/gen/xyz/openbmc_project/Smbios/meson.build
@@ -2,13 +2,13 @@
 subdir('MDR_V2')
 generated_others += custom_target(
     'xyz/openbmc_project/Smbios/MDR_V2__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml',  ],
     output: [ 'MDR_V2.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Smbios/MDR_V2',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/Activation/meson.build b/gen/xyz/openbmc_project/Software/Activation/meson.build
index 276f43b..d75823d 100644
--- a/gen/xyz/openbmc_project/Software/Activation/meson.build
+++ b/gen/xyz/openbmc_project/Software/Activation/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Activation__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/Activation.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Activation.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Activation',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build b/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
index 6d5d246..76a281a 100644
--- a/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
+++ b/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ActivationBlocksTransition__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ActivationBlocksTransition',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build b/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
index 03fe83b..7b963bd 100644
--- a/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
+++ b/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ActivationProgress__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/ActivationProgress.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ActivationProgress.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ActivationProgress',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build b/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
index 7fdcb09..7f3b626 100644
--- a/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
+++ b/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ApplyOptions__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/ApplyOptions.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ApplyOptions.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ApplyOptions',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/ApplyTime/meson.build b/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
index 26a95a3..16f7f3f 100644
--- a/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
+++ b/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ApplyTime__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/ApplyTime.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ApplyTime.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ApplyTime',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build b/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
index 6dc1198..d0012ee 100644
--- a/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
+++ b/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ExtendedVersion__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ExtendedVersion',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build b/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
index f7eda13..710c955 100644
--- a/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
+++ b/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/RedundancyPriority__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/RedundancyPriority',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build b/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
index 48907b6..9ced349 100644
--- a/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
+++ b/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/RequestedRedundancyPriority__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/RequestedRedundancyPriority',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/Version/meson.build b/gen/xyz/openbmc_project/Software/Version/meson.build
index b3d16fa..0ab69df 100644
--- a/gen/xyz/openbmc_project/Software/Version/meson.build
+++ b/gen/xyz/openbmc_project/Software/Version/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Version__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Software/Version.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Version.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Version',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Software/meson.build b/gen/xyz/openbmc_project/Software/meson.build
index 26233f5..da2e83b 100644
--- a/gen/xyz/openbmc_project/Software/meson.build
+++ b/gen/xyz/openbmc_project/Software/meson.build
@@ -2,13 +2,13 @@
 subdir('Activation')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/Activation__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/Activation.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/Activation.interface.yaml',  ],
     output: [ 'Activation.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Activation',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('ActivationBlocksTransition')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/ActivationBlocksTransition__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',  ],
     output: [ 'ActivationBlocksTransition.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ActivationBlocksTransition',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('ActivationProgress')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/ActivationProgress__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/ActivationProgress.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/ActivationProgress.interface.yaml',  ],
     output: [ 'ActivationProgress.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ActivationProgress',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('ApplyOptions')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/ApplyOptions__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/ApplyOptions.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/ApplyOptions.interface.yaml',  ],
     output: [ 'ApplyOptions.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ApplyOptions',
     ],
 )
@@ -58,13 +58,13 @@
 subdir('ApplyTime')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/ApplyTime__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/ApplyTime.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/ApplyTime.interface.yaml',  ],
     output: [ 'ApplyTime.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ApplyTime',
     ],
 )
@@ -72,13 +72,13 @@
 subdir('ExtendedVersion')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/ExtendedVersion__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',  ],
     output: [ 'ExtendedVersion.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ExtendedVersion',
     ],
 )
@@ -86,13 +86,13 @@
 subdir('RedundancyPriority')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/RedundancyPriority__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',  ],
     output: [ 'RedundancyPriority.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/RedundancyPriority',
     ],
 )
@@ -100,13 +100,13 @@
 subdir('RequestedRedundancyPriority')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/RequestedRedundancyPriority__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',  ],
     output: [ 'RequestedRedundancyPriority.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/RequestedRedundancyPriority',
     ],
 )
@@ -114,13 +114,13 @@
 subdir('Version')
 generated_others += custom_target(
     'xyz/openbmc_project/Software/Version__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Software/Version.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Software/Version.interface.yaml',  ],
     output: [ 'Version.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Version',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/BMC/meson.build b/gen/xyz/openbmc_project/State/BMC/meson.build
index d5e3710..a132856 100644
--- a/gen/xyz/openbmc_project/State/BMC/meson.build
+++ b/gen/xyz/openbmc_project/State/BMC/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/BMC__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/BMC.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/BMC.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/BMC',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build b/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
index c04d2c3..212b3b9 100644
--- a/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/BMCRedundancy__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/BMCRedundancy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build b/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
index c343308..71d6dd1 100644
--- a/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/PostCode__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Boot/PostCode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/Progress/meson.build b/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
index 693ce2c..5d65e07 100644
--- a/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/Progress__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Boot/Progress',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/Raw/meson.build b/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
index 6ae940c..b19c012 100644
--- a/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/Raw__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Boot/Raw',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/meson.build b/gen/xyz/openbmc_project/State/Boot/meson.build
index 905d7e2..6a29bdf 100644
--- a/gen/xyz/openbmc_project/State/Boot/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/meson.build
@@ -2,13 +2,13 @@
 subdir('PostCode')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Boot/PostCode__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
     output: [ 'PostCode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Boot/PostCode',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Progress')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Boot/Progress__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
     output: [ 'Progress.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Boot/Progress',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Raw')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Boot/Raw__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
     output: [ 'Raw.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Boot/Raw',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Chassis/meson.build b/gen/xyz/openbmc_project/State/Chassis/meson.build
index 90d9e75..852c274 100644
--- a/gen/xyz/openbmc_project/State/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/State/Chassis/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Chassis__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Chassis.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Chassis.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Chassis',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build b/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
index 1c6c4a4..7419209 100644
--- a/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/Availability__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Decorator/Availability',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build b/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
index 1f2e646..f2b6120 100644
--- a/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/OperationalStatus__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Decorator/OperationalStatus',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Decorator/meson.build b/gen/xyz/openbmc_project/State/Decorator/meson.build
index 67726a8..e490011 100644
--- a/gen/xyz/openbmc_project/State/Decorator/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/meson.build
@@ -2,13 +2,13 @@
 subdir('Availability')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Decorator/Availability__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
     output: [ 'Availability.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Decorator/Availability',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('OperationalStatus')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Decorator/OperationalStatus__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
     output: [ 'OperationalStatus.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Decorator/OperationalStatus',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Drive/meson.build b/gen/xyz/openbmc_project/State/Drive/meson.build
index 7233922..1b4941e 100644
--- a/gen/xyz/openbmc_project/State/Drive/meson.build
+++ b/gen/xyz/openbmc_project/State/Drive/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Drive__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Drive.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Drive.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Drive',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Host/meson.build b/gen/xyz/openbmc_project/State/Host/meson.build
index 3d3a886..339217d 100644
--- a/gen/xyz/openbmc_project/State/Host/meson.build
+++ b/gen/xyz/openbmc_project/State/Host/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Host__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Host.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Host.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Host',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build b/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
index 0277946..a855caa 100644
--- a/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
+++ b/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/OperatingSystem/Status__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/OperatingSystem/Status',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/OperatingSystem/meson.build b/gen/xyz/openbmc_project/State/OperatingSystem/meson.build
index c0cd94a..99c2a0b 100644
--- a/gen/xyz/openbmc_project/State/OperatingSystem/meson.build
+++ b/gen/xyz/openbmc_project/State/OperatingSystem/meson.build
@@ -2,13 +2,13 @@
 subdir('Status')
 generated_others += custom_target(
     'xyz/openbmc_project/State/OperatingSystem/Status__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
     output: [ 'Status.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/OperatingSystem/Status',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/PowerOnHours/meson.build b/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
index 131d859..aadc745 100644
--- a/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
+++ b/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/PowerOnHours__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/PowerOnHours',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build b/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
index 9b5d2f4..fd8d594 100644
--- a/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
+++ b/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/ScheduledHostTransition__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/ScheduledHostTransition',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build b/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build
index cfdf2c8..3cbe052 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Shutdown/Inventory__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Shutdown/Inventory',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build b/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build
index bf85bee..2ba4e00 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Shutdown/Power__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Shutdown/Power',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build b/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build
index 0b117ac..0427700 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Shutdown/ThermalEvent__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/State/Shutdown/ThermalEvent',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/meson.build b/gen/xyz/openbmc_project/State/Shutdown/meson.build
index 5a453cc..7cb978d 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/meson.build
@@ -2,13 +2,13 @@
 subdir('Inventory')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Shutdown/Inventory__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
     output: [ 'Inventory.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Shutdown/Inventory',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Power')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Shutdown/Power__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
     output: [ 'Power.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Shutdown/Power',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('ThermalEvent')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Shutdown/ThermalEvent__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
     output: [ 'ThermalEvent.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Shutdown/ThermalEvent',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/SystemdTarget/meson.build b/gen/xyz/openbmc_project/State/SystemdTarget/meson.build
index e5700f0..9969253 100644
--- a/gen/xyz/openbmc_project/State/SystemdTarget/meson.build
+++ b/gen/xyz/openbmc_project/State/SystemdTarget/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/SystemdTarget__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/SystemdTarget',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Watchdog/meson.build b/gen/xyz/openbmc_project/State/Watchdog/meson.build
index 165a1fb..624aa42 100644
--- a/gen/xyz/openbmc_project/State/Watchdog/meson.build
+++ b/gen/xyz/openbmc_project/State/Watchdog/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Watchdog__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/State/Watchdog',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/meson.build b/gen/xyz/openbmc_project/State/meson.build
index a5b6978..f27280e 100644
--- a/gen/xyz/openbmc_project/State/meson.build
+++ b/gen/xyz/openbmc_project/State/meson.build
@@ -2,13 +2,13 @@
 subdir('BMC')
 generated_others += custom_target(
     'xyz/openbmc_project/State/BMC__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/BMC.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/BMC.interface.yaml',  ],
     output: [ 'BMC.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/BMC',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('BMCRedundancy')
 generated_others += custom_target(
     'xyz/openbmc_project/State/BMCRedundancy__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
     output: [ 'BMCRedundancy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/BMCRedundancy',
     ],
 )
@@ -31,13 +31,13 @@
 subdir('Chassis')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Chassis__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/Chassis.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/Chassis.interface.yaml',  ],
     output: [ 'Chassis.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/Chassis',
     ],
 )
@@ -46,13 +46,13 @@
 subdir('Drive')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Drive__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/Drive.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/Drive.interface.yaml',  ],
     output: [ 'Drive.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/Drive',
     ],
 )
@@ -60,13 +60,13 @@
 subdir('Host')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Host__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/Host.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/Host.interface.yaml',  ],
     output: [ 'Host.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/Host',
     ],
 )
@@ -75,13 +75,13 @@
 subdir('PowerOnHours')
 generated_others += custom_target(
     'xyz/openbmc_project/State/PowerOnHours__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
     output: [ 'PowerOnHours.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/PowerOnHours',
     ],
 )
@@ -89,13 +89,13 @@
 subdir('ScheduledHostTransition')
 generated_others += custom_target(
     'xyz/openbmc_project/State/ScheduledHostTransition__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
     output: [ 'ScheduledHostTransition.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/ScheduledHostTransition',
     ],
 )
@@ -104,13 +104,13 @@
 subdir('SystemdTarget')
 generated_others += custom_target(
     'xyz/openbmc_project/State/SystemdTarget__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
     output: [ 'SystemdTarget.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/SystemdTarget',
     ],
 )
@@ -118,13 +118,13 @@
 subdir('Watchdog')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Watchdog__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
     output: [ 'Watchdog.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/State/Watchdog',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Telemetry/Report/meson.build b/gen/xyz/openbmc_project/Telemetry/Report/meson.build
index 3d6c59f..e8f159a 100644
--- a/gen/xyz/openbmc_project/Telemetry/Report/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/Report/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/Report__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Telemetry/Report.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/Report.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Telemetry/Report',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build b/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build
index 23ac6bf..6f40341 100644
--- a/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/ReportManager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/ReportManager__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Telemetry/ReportManager.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/ReportManager.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Telemetry/ReportManager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build b/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build
index cf0032d..2bb3180 100644
--- a/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/Trigger/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/Trigger__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Telemetry/Trigger.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/Trigger.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Telemetry/Trigger',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build b/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build
index 533e9f2..b714173 100644
--- a/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/TriggerManager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Telemetry/TriggerManager__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Telemetry/TriggerManager.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Telemetry/TriggerManager.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Telemetry/TriggerManager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Telemetry/meson.build b/gen/xyz/openbmc_project/Telemetry/meson.build
index 14684f9..a9383f5 100644
--- a/gen/xyz/openbmc_project/Telemetry/meson.build
+++ b/gen/xyz/openbmc_project/Telemetry/meson.build
@@ -2,13 +2,13 @@
 subdir('Report')
 generated_others += custom_target(
     'xyz/openbmc_project/Telemetry/Report__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Telemetry/Report.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Telemetry/Report.interface.yaml',  ],
     output: [ 'Report.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Telemetry/Report',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('ReportManager')
 generated_others += custom_target(
     'xyz/openbmc_project/Telemetry/ReportManager__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Telemetry/ReportManager.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Telemetry/ReportManager.interface.yaml',  ],
     output: [ 'ReportManager.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Telemetry/ReportManager',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Trigger')
 generated_others += custom_target(
     'xyz/openbmc_project/Telemetry/Trigger__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Telemetry/Trigger.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Telemetry/Trigger.interface.yaml',  ],
     output: [ 'Trigger.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Telemetry/Trigger',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('TriggerManager')
 generated_others += custom_target(
     'xyz/openbmc_project/Telemetry/TriggerManager__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Telemetry/TriggerManager.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Telemetry/TriggerManager.interface.yaml',  ],
     output: [ 'TriggerManager.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Telemetry/TriggerManager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Time/EpochTime/meson.build b/gen/xyz/openbmc_project/Time/EpochTime/meson.build
index 9d3334d..736385f 100644
--- a/gen/xyz/openbmc_project/Time/EpochTime/meson.build
+++ b/gen/xyz/openbmc_project/Time/EpochTime/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Time/EpochTime__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Time/EpochTime.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Time/EpochTime.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Time/EpochTime',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Time/Synchronization/meson.build b/gen/xyz/openbmc_project/Time/Synchronization/meson.build
index 47bddaf..44579d2 100644
--- a/gen/xyz/openbmc_project/Time/Synchronization/meson.build
+++ b/gen/xyz/openbmc_project/Time/Synchronization/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Time/Synchronization__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/Time/Synchronization.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/Time/Synchronization.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Time/Synchronization',
     ],
 )
diff --git a/gen/xyz/openbmc_project/Time/meson.build b/gen/xyz/openbmc_project/Time/meson.build
index 1705bb6..26c4405 100644
--- a/gen/xyz/openbmc_project/Time/meson.build
+++ b/gen/xyz/openbmc_project/Time/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/Time__cpp'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Time.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Time.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Time',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('EpochTime')
 generated_others += custom_target(
     'xyz/openbmc_project/Time/EpochTime__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Time/EpochTime.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Time/EpochTime.interface.yaml',  ],
     output: [ 'EpochTime.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Time/EpochTime',
     ],
 )
@@ -29,13 +29,13 @@
 subdir('Synchronization')
 generated_others += custom_target(
     'xyz/openbmc_project/Time/Synchronization__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/Time/Synchronization.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/Time/Synchronization.interface.yaml',  ],
     output: [ 'Synchronization.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Time/Synchronization',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/AccountPolicy/meson.build b/gen/xyz/openbmc_project/User/AccountPolicy/meson.build
index c64af7b..1ef3649 100644
--- a/gen/xyz/openbmc_project/User/AccountPolicy/meson.build
+++ b/gen/xyz/openbmc_project/User/AccountPolicy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/AccountPolicy__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/AccountPolicy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/AccountPolicy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/AccountPolicy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/Attributes/meson.build b/gen/xyz/openbmc_project/User/Attributes/meson.build
index b68a1fe..edac84a 100644
--- a/gen/xyz/openbmc_project/User/Attributes/meson.build
+++ b/gen/xyz/openbmc_project/User/Attributes/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Attributes__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/Attributes.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/Attributes.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/Attributes',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/Common/meson.build b/gen/xyz/openbmc_project/User/Common/meson.build
index 0974f20..94fe7f5 100644
--- a/gen/xyz/openbmc_project/User/Common/meson.build
+++ b/gen/xyz/openbmc_project/User/Common/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Common__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/Common.errors.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/Common.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/Common',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/Ldap/Config/meson.build b/gen/xyz/openbmc_project/User/Ldap/Config/meson.build
index 6e73858..48c8945 100644
--- a/gen/xyz/openbmc_project/User/Ldap/Config/meson.build
+++ b/gen/xyz/openbmc_project/User/Ldap/Config/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Ldap/Config__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/User/Ldap/Config.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/User/Ldap/Config.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/User/Ldap/Config',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/Ldap/Create/meson.build b/gen/xyz/openbmc_project/User/Ldap/Create/meson.build
index b96c6fa..f9967b2 100644
--- a/gen/xyz/openbmc_project/User/Ldap/Create/meson.build
+++ b/gen/xyz/openbmc_project/User/Ldap/Create/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Ldap/Create__cpp'.underscorify(),
-    input: [ '../../../../../../xyz/openbmc_project/User/Ldap/Create.interface.yaml',  ],
+    input: [ '../../../../../../yaml/xyz/openbmc_project/User/Ldap/Create.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../../yaml',
         'xyz/openbmc_project/User/Ldap/Create',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/Ldap/meson.build b/gen/xyz/openbmc_project/User/Ldap/meson.build
index b27689f..1daeee2 100644
--- a/gen/xyz/openbmc_project/User/Ldap/meson.build
+++ b/gen/xyz/openbmc_project/User/Ldap/meson.build
@@ -2,13 +2,13 @@
 subdir('Config')
 generated_others += custom_target(
     'xyz/openbmc_project/User/Ldap/Config__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/Ldap/Config.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/Ldap/Config.interface.yaml',  ],
     output: [ 'Config.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/Ldap/Config',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Create')
 generated_others += custom_target(
     'xyz/openbmc_project/User/Ldap/Create__markdown'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/Ldap/Create.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/Ldap/Create.interface.yaml',  ],
     output: [ 'Create.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/Ldap/Create',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/Manager/meson.build b/gen/xyz/openbmc_project/User/Manager/meson.build
index 0f8a96a..17ddccd 100644
--- a/gen/xyz/openbmc_project/User/Manager/meson.build
+++ b/gen/xyz/openbmc_project/User/Manager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/Manager__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/Manager.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/Manager.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/Manager',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build b/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build
index 8cd91c5..ff35997 100644
--- a/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build
+++ b/gen/xyz/openbmc_project/User/PrivilegeMapper/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/PrivilegeMapper__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/PrivilegeMapper.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/PrivilegeMapper.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/PrivilegeMapper',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build b/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build
index e0d4e35..434da77 100644
--- a/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build
+++ b/gen/xyz/openbmc_project/User/PrivilegeMapperEntry/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/User/PrivilegeMapperEntry__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/User/PrivilegeMapperEntry.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/User/PrivilegeMapperEntry.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/User/PrivilegeMapperEntry',
     ],
 )
diff --git a/gen/xyz/openbmc_project/User/meson.build b/gen/xyz/openbmc_project/User/meson.build
index 6c3481a..c7fbc51 100644
--- a/gen/xyz/openbmc_project/User/meson.build
+++ b/gen/xyz/openbmc_project/User/meson.build
@@ -2,13 +2,13 @@
 subdir('AccountPolicy')
 generated_others += custom_target(
     'xyz/openbmc_project/User/AccountPolicy__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/User/AccountPolicy.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/User/AccountPolicy.interface.yaml',  ],
     output: [ 'AccountPolicy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/User/AccountPolicy',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Attributes')
 generated_others += custom_target(
     'xyz/openbmc_project/User/Attributes__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/User/Attributes.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/User/Attributes.interface.yaml',  ],
     output: [ 'Attributes.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/User/Attributes',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Common')
 generated_others += custom_target(
     'xyz/openbmc_project/User/Common__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/User/Common.errors.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/User/Common.errors.yaml',  ],
     output: [ 'Common.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/User/Common',
     ],
 )
@@ -45,13 +45,13 @@
 subdir('Manager')
 generated_others += custom_target(
     'xyz/openbmc_project/User/Manager__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/User/Manager.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/User/Manager.interface.yaml',  ],
     output: [ 'Manager.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/User/Manager',
     ],
 )
@@ -59,13 +59,13 @@
 subdir('PrivilegeMapper')
 generated_others += custom_target(
     'xyz/openbmc_project/User/PrivilegeMapper__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/User/PrivilegeMapper.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/User/PrivilegeMapper.interface.yaml',  ],
     output: [ 'PrivilegeMapper.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/User/PrivilegeMapper',
     ],
 )
@@ -73,13 +73,13 @@
 subdir('PrivilegeMapperEntry')
 generated_others += custom_target(
     'xyz/openbmc_project/User/PrivilegeMapperEntry__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/User/PrivilegeMapperEntry.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/User/PrivilegeMapperEntry.interface.yaml',  ],
     output: [ 'PrivilegeMapperEntry.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/User/PrivilegeMapperEntry',
     ],
 )
diff --git a/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build
index 16b9753..ccb9a2b 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Legacy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Legacy__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/VirtualMedia/Legacy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Legacy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Legacy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build b/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build
index 13046f1..f8d7a75 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/MountPoint/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/MountPoint__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/VirtualMedia/MountPoint.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/MountPoint.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/MountPoint',
     ],
 )
diff --git a/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build
index f0ef44f..c4735c6 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Process/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Process__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/VirtualMedia/Process.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Process.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Process',
     ],
 )
diff --git a/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build
index e58cc98..88c2ebb 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Proxy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Proxy__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/VirtualMedia/Proxy.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Proxy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Proxy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build b/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build
index 145f1c6..41d6b12 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/Stats/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/VirtualMedia/Stats__cpp'.underscorify(),
-    input: [ '../../../../../xyz/openbmc_project/VirtualMedia/Stats.interface.yaml',  ],
+    input: [ '../../../../../yaml/xyz/openbmc_project/VirtualMedia/Stats.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../../..',
+        '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Stats',
     ],
 )
diff --git a/gen/xyz/openbmc_project/VirtualMedia/meson.build b/gen/xyz/openbmc_project/VirtualMedia/meson.build
index ab59b76..7ecf8ba 100644
--- a/gen/xyz/openbmc_project/VirtualMedia/meson.build
+++ b/gen/xyz/openbmc_project/VirtualMedia/meson.build
@@ -2,13 +2,13 @@
 subdir('Legacy')
 generated_others += custom_target(
     'xyz/openbmc_project/VirtualMedia/Legacy__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/VirtualMedia/Legacy.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/VirtualMedia/Legacy.interface.yaml',  ],
     output: [ 'Legacy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Legacy',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('MountPoint')
 generated_others += custom_target(
     'xyz/openbmc_project/VirtualMedia/MountPoint__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/VirtualMedia/MountPoint.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/VirtualMedia/MountPoint.interface.yaml',  ],
     output: [ 'MountPoint.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/MountPoint',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('Process')
 generated_others += custom_target(
     'xyz/openbmc_project/VirtualMedia/Process__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/VirtualMedia/Process.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/VirtualMedia/Process.interface.yaml',  ],
     output: [ 'Process.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Process',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('Proxy')
 generated_others += custom_target(
     'xyz/openbmc_project/VirtualMedia/Proxy__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/VirtualMedia/Proxy.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/VirtualMedia/Proxy.interface.yaml',  ],
     output: [ 'Proxy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Proxy',
     ],
 )
@@ -58,13 +58,13 @@
 subdir('Stats')
 generated_others += custom_target(
     'xyz/openbmc_project/VirtualMedia/Stats__markdown'.underscorify(),
-    input: [ '../../../../xyz/openbmc_project/VirtualMedia/Stats.interface.yaml',  ],
+    input: [ '../../../../yaml/xyz/openbmc_project/VirtualMedia/Stats.interface.yaml',  ],
     output: [ 'Stats.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../../..',
+        '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/VirtualMedia/Stats',
     ],
 )
diff --git a/gen/xyz/openbmc_project/meson.build b/gen/xyz/openbmc_project/meson.build
index 37e4567..2e0eb1a 100644
--- a/gen/xyz/openbmc_project/meson.build
+++ b/gen/xyz/openbmc_project/meson.build
@@ -2,13 +2,13 @@
 subdir('Association')
 generated_others += custom_target(
     'xyz/openbmc_project/Association__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/Association.interface.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/Association.interface.yaml',  ],
     output: [ 'Association.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/Association',
     ],
 )
@@ -17,13 +17,13 @@
 subdir('Certs')
 generated_others += custom_target(
     'xyz/openbmc_project/Certs__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/Certs.errors.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/Certs.errors.yaml',  ],
     output: [ 'Certs.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/Certs',
     ],
 )
@@ -34,13 +34,13 @@
 subdir('Common')
 generated_others += custom_target(
     'xyz/openbmc_project/Common__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/Common.errors.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/Common.errors.yaml',  ],
     output: [ 'Common.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/Common',
     ],
 )
@@ -51,13 +51,13 @@
 subdir('Inventory')
 generated_others += custom_target(
     'xyz/openbmc_project/Inventory__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/Inventory.errors.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/Inventory.errors.yaml',  ],
     output: [ 'Inventory.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/Inventory',
     ],
 )
@@ -72,13 +72,13 @@
 subdir('ObjectMapper')
 generated_others += custom_target(
     'xyz/openbmc_project/ObjectMapper__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/ObjectMapper.interface.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/ObjectMapper.interface.yaml',  ],
     output: [ 'ObjectMapper.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/ObjectMapper',
     ],
 )
@@ -88,13 +88,13 @@
 subdir('ScheduledTime')
 generated_others += custom_target(
     'xyz/openbmc_project/ScheduledTime__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/ScheduledTime.errors.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/ScheduledTime.errors.yaml',  ],
     output: [ 'ScheduledTime.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/ScheduledTime',
     ],
 )
@@ -107,13 +107,13 @@
 subdir('Time')
 generated_others += custom_target(
     'xyz/openbmc_project/Time__markdown'.underscorify(),
-    input: [ '../../../xyz/openbmc_project/Time.errors.yaml',  ],
+    input: [ '../../../yaml/xyz/openbmc_project/Time.errors.yaml',  ],
     output: [ 'Time.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.current_source_dir() / '../../..',
+        '--directory', meson.current_source_dir() / '../../../yaml',
         'xyz/openbmc_project/Time',
     ],
 )