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