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',
     ],
 )