diff --git a/gen/com/ibm/Dump/Create/meson.build b/gen/com/ibm/Dump/Create/meson.build
index 019eed3..69efeb5 100644
--- a/gen/com/ibm/Dump/Create/meson.build
+++ b/gen/com/ibm/Dump/Create/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/Dump/Create__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/Dump/Create.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/Dump/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',
         'com/ibm/Dump/Create',
     ],
 )
diff --git a/gen/com/ibm/Dump/Entry/Hostboot/meson.build b/gen/com/ibm/Dump/Entry/Hostboot/meson.build
index 9385bb7..17d510d 100644
--- a/gen/com/ibm/Dump/Entry/Hostboot/meson.build
+++ b/gen/com/ibm/Dump/Entry/Hostboot/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/Dump/Entry/Hostboot__cpp'.underscorify(),
-    input: [ '../../../../../../com/ibm/Dump/Entry/Hostboot.interface.yaml',  ],
+    input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Hostboot.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',
         'com/ibm/Dump/Entry/Hostboot',
     ],
 )
diff --git a/gen/com/ibm/Dump/Entry/Resource/meson.build b/gen/com/ibm/Dump/Entry/Resource/meson.build
index 06e3a9d..7275073 100644
--- a/gen/com/ibm/Dump/Entry/Resource/meson.build
+++ b/gen/com/ibm/Dump/Entry/Resource/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/Dump/Entry/Resource__cpp'.underscorify(),
-    input: [ '../../../../../../com/ibm/Dump/Entry/Resource.interface.yaml',  ],
+    input: [ '../../../../../../yaml/com/ibm/Dump/Entry/Resource.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',
         'com/ibm/Dump/Entry/Resource',
     ],
 )
diff --git a/gen/com/ibm/Dump/Entry/meson.build b/gen/com/ibm/Dump/Entry/meson.build
index b170e64..1ec6118 100644
--- a/gen/com/ibm/Dump/Entry/meson.build
+++ b/gen/com/ibm/Dump/Entry/meson.build
@@ -2,13 +2,13 @@
 subdir('Hostboot')
 generated_others += custom_target(
     'com/ibm/Dump/Entry/Hostboot__markdown'.underscorify(),
-    input: [ '../../../../../com/ibm/Dump/Entry/Hostboot.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml',  ],
     output: [ 'Hostboot.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',
         'com/ibm/Dump/Entry/Hostboot',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('Resource')
 generated_others += custom_target(
     'com/ibm/Dump/Entry/Resource__markdown'.underscorify(),
-    input: [ '../../../../../com/ibm/Dump/Entry/Resource.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/Dump/Entry/Resource.interface.yaml',  ],
     output: [ 'Resource.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',
         'com/ibm/Dump/Entry/Resource',
     ],
 )
diff --git a/gen/com/ibm/Dump/meson.build b/gen/com/ibm/Dump/meson.build
index f9a5ed7..67aa9e0 100644
--- a/gen/com/ibm/Dump/meson.build
+++ b/gen/com/ibm/Dump/meson.build
@@ -2,13 +2,13 @@
 subdir('Create')
 generated_others += custom_target(
     'com/ibm/Dump/Create__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/Dump/Create.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/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',
         'com/ibm/Dump/Create',
     ],
 )
diff --git a/gen/com/ibm/Logging/Policy/meson.build b/gen/com/ibm/Logging/Policy/meson.build
index d443ef3..2a20a13 100644
--- a/gen/com/ibm/Logging/Policy/meson.build
+++ b/gen/com/ibm/Logging/Policy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/Logging/Policy__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/Logging/Policy.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/Logging/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',
         'com/ibm/Logging/Policy',
     ],
 )
diff --git a/gen/com/ibm/Logging/meson.build b/gen/com/ibm/Logging/meson.build
index 18fb0fb..814534b 100644
--- a/gen/com/ibm/Logging/meson.build
+++ b/gen/com/ibm/Logging/meson.build
@@ -2,13 +2,13 @@
 subdir('Policy')
 generated_others += custom_target(
     'com/ibm/Logging/Policy__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/Logging/Policy.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/Logging/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',
         'com/ibm/Logging/Policy',
     ],
 )
diff --git a/gen/com/ibm/VPD/Manager/meson.build b/gen/com/ibm/VPD/Manager/meson.build
index 936fd0d..fb049b8 100644
--- a/gen/com/ibm/VPD/Manager/meson.build
+++ b/gen/com/ibm/VPD/Manager/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/VPD/Manager__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/VPD/Manager.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/VPD/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',
         'com/ibm/VPD/Manager',
     ],
 )
diff --git a/gen/com/ibm/VPD/meson.build b/gen/com/ibm/VPD/meson.build
index 0602016..01b468f 100644
--- a/gen/com/ibm/VPD/meson.build
+++ b/gen/com/ibm/VPD/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/VPD__cpp'.underscorify(),
-    input: [ '../../../../com/ibm/VPD.errors.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/VPD.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',
         'com/ibm/VPD',
     ],
 )
@@ -15,13 +15,13 @@
 subdir('Manager')
 generated_others += custom_target(
     'com/ibm/VPD/Manager__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/VPD/Manager.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/VPD/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',
         'com/ibm/VPD/Manager',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/CP00/meson.build b/gen/com/ibm/ipzvpd/CP00/meson.build
index 84e4ce8..90af281 100644
--- a/gen/com/ibm/ipzvpd/CP00/meson.build
+++ b/gen/com/ibm/ipzvpd/CP00/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/CP00__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/CP00.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/CP00.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',
         'com/ibm/ipzvpd/CP00',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/CRP0/meson.build b/gen/com/ibm/ipzvpd/CRP0/meson.build
index 638b3d8..ddda21a 100644
--- a/gen/com/ibm/ipzvpd/CRP0/meson.build
+++ b/gen/com/ibm/ipzvpd/CRP0/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/CRP0__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/CRP0.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/CRP0.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',
         'com/ibm/ipzvpd/CRP0',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/DINF/meson.build b/gen/com/ibm/ipzvpd/DINF/meson.build
index 3d5d538..5f2d40e 100644
--- a/gen/com/ibm/ipzvpd/DINF/meson.build
+++ b/gen/com/ibm/ipzvpd/DINF/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/DINF__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/DINF.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/DINF.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',
         'com/ibm/ipzvpd/DINF',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP0/meson.build b/gen/com/ibm/ipzvpd/LRP0/meson.build
index 84de4e0..a01cd8a 100644
--- a/gen/com/ibm/ipzvpd/LRP0/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP0/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP0__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP0.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP0.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',
         'com/ibm/ipzvpd/LRP0',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP1/meson.build b/gen/com/ibm/ipzvpd/LRP1/meson.build
index da81af8..763f8db 100644
--- a/gen/com/ibm/ipzvpd/LRP1/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP1/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP1__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP1.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP1.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',
         'com/ibm/ipzvpd/LRP1',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP2/meson.build b/gen/com/ibm/ipzvpd/LRP2/meson.build
index 78469a9..c16dc84 100644
--- a/gen/com/ibm/ipzvpd/LRP2/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP2/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP2__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP2.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP2.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',
         'com/ibm/ipzvpd/LRP2',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP3/meson.build b/gen/com/ibm/ipzvpd/LRP3/meson.build
index 6e5e129..86a04ac 100644
--- a/gen/com/ibm/ipzvpd/LRP3/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP3/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP3__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP3.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP3.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',
         'com/ibm/ipzvpd/LRP3',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP4/meson.build b/gen/com/ibm/ipzvpd/LRP4/meson.build
index 81886ad..342672f 100644
--- a/gen/com/ibm/ipzvpd/LRP4/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP4/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP4__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP4.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP4.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',
         'com/ibm/ipzvpd/LRP4',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP5/meson.build b/gen/com/ibm/ipzvpd/LRP5/meson.build
index ba30e53..c416318 100644
--- a/gen/com/ibm/ipzvpd/LRP5/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP5/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP5__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP5.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP5.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',
         'com/ibm/ipzvpd/LRP5',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP6/meson.build b/gen/com/ibm/ipzvpd/LRP6/meson.build
index 0bcc19b..6378fed 100644
--- a/gen/com/ibm/ipzvpd/LRP6/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP6/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP6__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP6.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP6.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',
         'com/ibm/ipzvpd/LRP6',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LRP7/meson.build b/gen/com/ibm/ipzvpd/LRP7/meson.build
index fa7e507..61eed09 100644
--- a/gen/com/ibm/ipzvpd/LRP7/meson.build
+++ b/gen/com/ibm/ipzvpd/LRP7/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LRP7__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LRP7.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LRP7.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',
         'com/ibm/ipzvpd/LRP7',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP0/meson.build b/gen/com/ibm/ipzvpd/LWP0/meson.build
index 137913a..c6d619d 100644
--- a/gen/com/ibm/ipzvpd/LWP0/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP0/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP0__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP0.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP0.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',
         'com/ibm/ipzvpd/LWP0',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP1/meson.build b/gen/com/ibm/ipzvpd/LWP1/meson.build
index 1dfef21..bb80ff0 100644
--- a/gen/com/ibm/ipzvpd/LWP1/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP1/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP1__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP1.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP1.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',
         'com/ibm/ipzvpd/LWP1',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP2/meson.build b/gen/com/ibm/ipzvpd/LWP2/meson.build
index 9bad82b..79e522b 100644
--- a/gen/com/ibm/ipzvpd/LWP2/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP2/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP2__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP2.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP2.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',
         'com/ibm/ipzvpd/LWP2',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP3/meson.build b/gen/com/ibm/ipzvpd/LWP3/meson.build
index 546bce3..85d5711 100644
--- a/gen/com/ibm/ipzvpd/LWP3/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP3/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP3__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP3.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP3.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',
         'com/ibm/ipzvpd/LWP3',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP4/meson.build b/gen/com/ibm/ipzvpd/LWP4/meson.build
index fcc66a8..5dc031b 100644
--- a/gen/com/ibm/ipzvpd/LWP4/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP4/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP4__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP4.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP4.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',
         'com/ibm/ipzvpd/LWP4',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP5/meson.build b/gen/com/ibm/ipzvpd/LWP5/meson.build
index 0001597..91c38a4 100644
--- a/gen/com/ibm/ipzvpd/LWP5/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP5/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP5__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP5.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP5.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',
         'com/ibm/ipzvpd/LWP5',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP6/meson.build b/gen/com/ibm/ipzvpd/LWP6/meson.build
index 63e8f37..e553193 100644
--- a/gen/com/ibm/ipzvpd/LWP6/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP6/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP6__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP6.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP6.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',
         'com/ibm/ipzvpd/LWP6',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LWP7/meson.build b/gen/com/ibm/ipzvpd/LWP7/meson.build
index c5cc136..d5a5509 100644
--- a/gen/com/ibm/ipzvpd/LWP7/meson.build
+++ b/gen/com/ibm/ipzvpd/LWP7/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LWP7__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LWP7.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LWP7.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',
         'com/ibm/ipzvpd/LWP7',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/LXR0/meson.build b/gen/com/ibm/ipzvpd/LXR0/meson.build
index 38d52be..5c7c45d 100644
--- a/gen/com/ibm/ipzvpd/LXR0/meson.build
+++ b/gen/com/ibm/ipzvpd/LXR0/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/LXR0__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/LXR0.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/LXR0.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',
         'com/ibm/ipzvpd/LXR0',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/Location/meson.build b/gen/com/ibm/ipzvpd/Location/meson.build
index db4f1d2..92b10eb 100644
--- a/gen/com/ibm/ipzvpd/Location/meson.build
+++ b/gen/com/ibm/ipzvpd/Location/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/Location__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/Location.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/Location.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',
         'com/ibm/ipzvpd/Location',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/MER0/meson.build b/gen/com/ibm/ipzvpd/MER0/meson.build
index cba90a1..aa09f08 100644
--- a/gen/com/ibm/ipzvpd/MER0/meson.build
+++ b/gen/com/ibm/ipzvpd/MER0/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/MER0__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/MER0.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/MER0.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',
         'com/ibm/ipzvpd/MER0',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/UTIL/meson.build b/gen/com/ibm/ipzvpd/UTIL/meson.build
index d1bbdc7..c668cb8 100644
--- a/gen/com/ibm/ipzvpd/UTIL/meson.build
+++ b/gen/com/ibm/ipzvpd/UTIL/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/UTIL__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/UTIL.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/UTIL.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',
         'com/ibm/ipzvpd/UTIL',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VCEN/meson.build b/gen/com/ibm/ipzvpd/VCEN/meson.build
index 463252f..f543373 100644
--- a/gen/com/ibm/ipzvpd/VCEN/meson.build
+++ b/gen/com/ibm/ipzvpd/VCEN/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VCEN__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VCEN.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VCEN.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',
         'com/ibm/ipzvpd/VCEN',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VCFG/meson.build b/gen/com/ibm/ipzvpd/VCFG/meson.build
index dfe5386..254131b 100644
--- a/gen/com/ibm/ipzvpd/VCFG/meson.build
+++ b/gen/com/ibm/ipzvpd/VCFG/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VCFG__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VCFG.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VCFG.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',
         'com/ibm/ipzvpd/VCFG',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VEIR/meson.build b/gen/com/ibm/ipzvpd/VEIR/meson.build
index 5a53ad1..f5387c7 100644
--- a/gen/com/ibm/ipzvpd/VEIR/meson.build
+++ b/gen/com/ibm/ipzvpd/VEIR/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VEIR__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VEIR.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VEIR.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',
         'com/ibm/ipzvpd/VEIR',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VER0/meson.build b/gen/com/ibm/ipzvpd/VER0/meson.build
index 9e83988..bc8e58d 100644
--- a/gen/com/ibm/ipzvpd/VER0/meson.build
+++ b/gen/com/ibm/ipzvpd/VER0/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VER0__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VER0.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VER0.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',
         'com/ibm/ipzvpd/VER0',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VINI/meson.build b/gen/com/ibm/ipzvpd/VINI/meson.build
index 2b6fc0f..0923562 100644
--- a/gen/com/ibm/ipzvpd/VINI/meson.build
+++ b/gen/com/ibm/ipzvpd/VINI/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VINI__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VINI.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VINI.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',
         'com/ibm/ipzvpd/VINI',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VMPU/meson.build b/gen/com/ibm/ipzvpd/VMPU/meson.build
index 5a4aece..c371cbb 100644
--- a/gen/com/ibm/ipzvpd/VMPU/meson.build
+++ b/gen/com/ibm/ipzvpd/VMPU/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VMPU__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VMPU.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VMPU.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',
         'com/ibm/ipzvpd/VMPU',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VMSC/meson.build b/gen/com/ibm/ipzvpd/VMSC/meson.build
index 80eb41c..f71c0dd 100644
--- a/gen/com/ibm/ipzvpd/VMSC/meson.build
+++ b/gen/com/ibm/ipzvpd/VMSC/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VMSC__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VMSC.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VMSC.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',
         'com/ibm/ipzvpd/VMSC',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VPRI/meson.build b/gen/com/ibm/ipzvpd/VPRI/meson.build
index e179663..a18e88a 100644
--- a/gen/com/ibm/ipzvpd/VPRI/meson.build
+++ b/gen/com/ibm/ipzvpd/VPRI/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VPRI__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VPRI.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VPRI.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',
         'com/ibm/ipzvpd/VPRI',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VR10/meson.build b/gen/com/ibm/ipzvpd/VR10/meson.build
index 7245f1c..ff993a1 100644
--- a/gen/com/ibm/ipzvpd/VR10/meson.build
+++ b/gen/com/ibm/ipzvpd/VR10/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VR10__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VR10.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VR10.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',
         'com/ibm/ipzvpd/VR10',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VRML/meson.build b/gen/com/ibm/ipzvpd/VRML/meson.build
index ddf5548..f6ef860 100644
--- a/gen/com/ibm/ipzvpd/VRML/meson.build
+++ b/gen/com/ibm/ipzvpd/VRML/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VRML__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VRML.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VRML.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',
         'com/ibm/ipzvpd/VRML',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VRTN/meson.build b/gen/com/ibm/ipzvpd/VRTN/meson.build
index 8599248..63a7b8e 100644
--- a/gen/com/ibm/ipzvpd/VRTN/meson.build
+++ b/gen/com/ibm/ipzvpd/VRTN/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VRTN__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VRTN.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VRTN.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',
         'com/ibm/ipzvpd/VRTN',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VSBP/meson.build b/gen/com/ibm/ipzvpd/VSBP/meson.build
index d0656d1..ad60385 100644
--- a/gen/com/ibm/ipzvpd/VSBP/meson.build
+++ b/gen/com/ibm/ipzvpd/VSBP/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VSBP__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VSBP.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VSBP.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',
         'com/ibm/ipzvpd/VSBP',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VSRC/meson.build b/gen/com/ibm/ipzvpd/VSRC/meson.build
index b8bce26..cedb92a 100644
--- a/gen/com/ibm/ipzvpd/VSRC/meson.build
+++ b/gen/com/ibm/ipzvpd/VSRC/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VSRC__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VSRC.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VSRC.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',
         'com/ibm/ipzvpd/VSRC',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VSYS/meson.build b/gen/com/ibm/ipzvpd/VSYS/meson.build
index 46379da..ad71dea 100644
--- a/gen/com/ibm/ipzvpd/VSYS/meson.build
+++ b/gen/com/ibm/ipzvpd/VSYS/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VSYS__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VSYS.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VSYS.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',
         'com/ibm/ipzvpd/VSYS',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VW10/meson.build b/gen/com/ibm/ipzvpd/VW10/meson.build
index b04a3e1..650b920 100644
--- a/gen/com/ibm/ipzvpd/VW10/meson.build
+++ b/gen/com/ibm/ipzvpd/VW10/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VW10__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VW10.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VW10.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',
         'com/ibm/ipzvpd/VW10',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/VWML/meson.build b/gen/com/ibm/ipzvpd/VWML/meson.build
index bfe1ce3..84a008e 100644
--- a/gen/com/ibm/ipzvpd/VWML/meson.build
+++ b/gen/com/ibm/ipzvpd/VWML/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'com/ibm/ipzvpd/VWML__cpp'.underscorify(),
-    input: [ '../../../../../com/ibm/ipzvpd/VWML.interface.yaml',  ],
+    input: [ '../../../../../yaml/com/ibm/ipzvpd/VWML.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',
         'com/ibm/ipzvpd/VWML',
     ],
 )
diff --git a/gen/com/ibm/ipzvpd/meson.build b/gen/com/ibm/ipzvpd/meson.build
index 4d4709b..5978fab 100644
--- a/gen/com/ibm/ipzvpd/meson.build
+++ b/gen/com/ibm/ipzvpd/meson.build
@@ -2,13 +2,13 @@
 subdir('CP00')
 generated_others += custom_target(
     'com/ibm/ipzvpd/CP00__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/CP00.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/CP00.interface.yaml',  ],
     output: [ 'CP00.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',
         'com/ibm/ipzvpd/CP00',
     ],
 )
@@ -16,13 +16,13 @@
 subdir('CRP0')
 generated_others += custom_target(
     'com/ibm/ipzvpd/CRP0__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/CRP0.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/CRP0.interface.yaml',  ],
     output: [ 'CRP0.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',
         'com/ibm/ipzvpd/CRP0',
     ],
 )
@@ -30,13 +30,13 @@
 subdir('DINF')
 generated_others += custom_target(
     'com/ibm/ipzvpd/DINF__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/DINF.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/DINF.interface.yaml',  ],
     output: [ 'DINF.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',
         'com/ibm/ipzvpd/DINF',
     ],
 )
@@ -44,13 +44,13 @@
 subdir('LRP0')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP0__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP0.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP0.interface.yaml',  ],
     output: [ 'LRP0.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',
         'com/ibm/ipzvpd/LRP0',
     ],
 )
@@ -58,13 +58,13 @@
 subdir('LRP1')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP1__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP1.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP1.interface.yaml',  ],
     output: [ 'LRP1.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',
         'com/ibm/ipzvpd/LRP1',
     ],
 )
@@ -72,13 +72,13 @@
 subdir('LRP2')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP2__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP2.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP2.interface.yaml',  ],
     output: [ 'LRP2.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',
         'com/ibm/ipzvpd/LRP2',
     ],
 )
@@ -86,13 +86,13 @@
 subdir('LRP3')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP3__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP3.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP3.interface.yaml',  ],
     output: [ 'LRP3.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',
         'com/ibm/ipzvpd/LRP3',
     ],
 )
@@ -100,13 +100,13 @@
 subdir('LRP4')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP4__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP4.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP4.interface.yaml',  ],
     output: [ 'LRP4.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',
         'com/ibm/ipzvpd/LRP4',
     ],
 )
@@ -114,13 +114,13 @@
 subdir('LRP5')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP5__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP5.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP5.interface.yaml',  ],
     output: [ 'LRP5.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',
         'com/ibm/ipzvpd/LRP5',
     ],
 )
@@ -128,13 +128,13 @@
 subdir('LRP6')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP6__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP6.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP6.interface.yaml',  ],
     output: [ 'LRP6.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',
         'com/ibm/ipzvpd/LRP6',
     ],
 )
@@ -142,13 +142,13 @@
 subdir('LRP7')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LRP7__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LRP7.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LRP7.interface.yaml',  ],
     output: [ 'LRP7.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',
         'com/ibm/ipzvpd/LRP7',
     ],
 )
@@ -156,13 +156,13 @@
 subdir('LWP0')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP0__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP0.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP0.interface.yaml',  ],
     output: [ 'LWP0.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',
         'com/ibm/ipzvpd/LWP0',
     ],
 )
@@ -170,13 +170,13 @@
 subdir('LWP1')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP1__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP1.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP1.interface.yaml',  ],
     output: [ 'LWP1.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',
         'com/ibm/ipzvpd/LWP1',
     ],
 )
@@ -184,13 +184,13 @@
 subdir('LWP2')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP2__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP2.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP2.interface.yaml',  ],
     output: [ 'LWP2.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',
         'com/ibm/ipzvpd/LWP2',
     ],
 )
@@ -198,13 +198,13 @@
 subdir('LWP3')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP3__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP3.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP3.interface.yaml',  ],
     output: [ 'LWP3.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',
         'com/ibm/ipzvpd/LWP3',
     ],
 )
@@ -212,13 +212,13 @@
 subdir('LWP4')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP4__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP4.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP4.interface.yaml',  ],
     output: [ 'LWP4.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',
         'com/ibm/ipzvpd/LWP4',
     ],
 )
@@ -226,13 +226,13 @@
 subdir('LWP5')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP5__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP5.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP5.interface.yaml',  ],
     output: [ 'LWP5.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',
         'com/ibm/ipzvpd/LWP5',
     ],
 )
@@ -240,13 +240,13 @@
 subdir('LWP6')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP6__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP6.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP6.interface.yaml',  ],
     output: [ 'LWP6.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',
         'com/ibm/ipzvpd/LWP6',
     ],
 )
@@ -254,13 +254,13 @@
 subdir('LWP7')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LWP7__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LWP7.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LWP7.interface.yaml',  ],
     output: [ 'LWP7.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',
         'com/ibm/ipzvpd/LWP7',
     ],
 )
@@ -268,13 +268,13 @@
 subdir('LXR0')
 generated_others += custom_target(
     'com/ibm/ipzvpd/LXR0__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/LXR0.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/LXR0.interface.yaml',  ],
     output: [ 'LXR0.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',
         'com/ibm/ipzvpd/LXR0',
     ],
 )
@@ -282,13 +282,13 @@
 subdir('Location')
 generated_others += custom_target(
     'com/ibm/ipzvpd/Location__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/Location.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/Location.interface.yaml',  ],
     output: [ 'Location.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',
         'com/ibm/ipzvpd/Location',
     ],
 )
@@ -296,13 +296,13 @@
 subdir('MER0')
 generated_others += custom_target(
     'com/ibm/ipzvpd/MER0__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/MER0.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/MER0.interface.yaml',  ],
     output: [ 'MER0.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',
         'com/ibm/ipzvpd/MER0',
     ],
 )
@@ -310,13 +310,13 @@
 subdir('UTIL')
 generated_others += custom_target(
     'com/ibm/ipzvpd/UTIL__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/UTIL.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/UTIL.interface.yaml',  ],
     output: [ 'UTIL.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',
         'com/ibm/ipzvpd/UTIL',
     ],
 )
@@ -324,13 +324,13 @@
 subdir('VCEN')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VCEN__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VCEN.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VCEN.interface.yaml',  ],
     output: [ 'VCEN.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',
         'com/ibm/ipzvpd/VCEN',
     ],
 )
@@ -338,13 +338,13 @@
 subdir('VCFG')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VCFG__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VCFG.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VCFG.interface.yaml',  ],
     output: [ 'VCFG.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',
         'com/ibm/ipzvpd/VCFG',
     ],
 )
@@ -352,13 +352,13 @@
 subdir('VEIR')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VEIR__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VEIR.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VEIR.interface.yaml',  ],
     output: [ 'VEIR.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',
         'com/ibm/ipzvpd/VEIR',
     ],
 )
@@ -366,13 +366,13 @@
 subdir('VER0')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VER0__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VER0.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VER0.interface.yaml',  ],
     output: [ 'VER0.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',
         'com/ibm/ipzvpd/VER0',
     ],
 )
@@ -380,13 +380,13 @@
 subdir('VINI')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VINI__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VINI.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VINI.interface.yaml',  ],
     output: [ 'VINI.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',
         'com/ibm/ipzvpd/VINI',
     ],
 )
@@ -394,13 +394,13 @@
 subdir('VMPU')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VMPU__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VMPU.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VMPU.interface.yaml',  ],
     output: [ 'VMPU.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',
         'com/ibm/ipzvpd/VMPU',
     ],
 )
@@ -408,13 +408,13 @@
 subdir('VMSC')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VMSC__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VMSC.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VMSC.interface.yaml',  ],
     output: [ 'VMSC.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',
         'com/ibm/ipzvpd/VMSC',
     ],
 )
@@ -422,13 +422,13 @@
 subdir('VPRI')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VPRI__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VPRI.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VPRI.interface.yaml',  ],
     output: [ 'VPRI.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',
         'com/ibm/ipzvpd/VPRI',
     ],
 )
@@ -436,13 +436,13 @@
 subdir('VR10')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VR10__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VR10.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VR10.interface.yaml',  ],
     output: [ 'VR10.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',
         'com/ibm/ipzvpd/VR10',
     ],
 )
@@ -450,13 +450,13 @@
 subdir('VRML')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VRML__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VRML.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VRML.interface.yaml',  ],
     output: [ 'VRML.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',
         'com/ibm/ipzvpd/VRML',
     ],
 )
@@ -464,13 +464,13 @@
 subdir('VRTN')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VRTN__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VRTN.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VRTN.interface.yaml',  ],
     output: [ 'VRTN.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',
         'com/ibm/ipzvpd/VRTN',
     ],
 )
@@ -478,13 +478,13 @@
 subdir('VSBP')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VSBP__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VSBP.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VSBP.interface.yaml',  ],
     output: [ 'VSBP.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',
         'com/ibm/ipzvpd/VSBP',
     ],
 )
@@ -492,13 +492,13 @@
 subdir('VSRC')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VSRC__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VSRC.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VSRC.interface.yaml',  ],
     output: [ 'VSRC.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',
         'com/ibm/ipzvpd/VSRC',
     ],
 )
@@ -506,13 +506,13 @@
 subdir('VSYS')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VSYS__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VSYS.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VSYS.interface.yaml',  ],
     output: [ 'VSYS.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',
         'com/ibm/ipzvpd/VSYS',
     ],
 )
@@ -520,13 +520,13 @@
 subdir('VW10')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VW10__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VW10.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VW10.interface.yaml',  ],
     output: [ 'VW10.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',
         'com/ibm/ipzvpd/VW10',
     ],
 )
@@ -534,13 +534,13 @@
 subdir('VWML')
 generated_others += custom_target(
     'com/ibm/ipzvpd/VWML__markdown'.underscorify(),
-    input: [ '../../../../com/ibm/ipzvpd/VWML.interface.yaml',  ],
+    input: [ '../../../../yaml/com/ibm/ipzvpd/VWML.interface.yaml',  ],
     output: [ 'VWML.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',
         'com/ibm/ipzvpd/VWML',
     ],
 )
diff --git a/gen/com/ibm/meson.build b/gen/com/ibm/meson.build
index d1a12d6..ddc0342 100644
--- a/gen/com/ibm/meson.build
+++ b/gen/com/ibm/meson.build
@@ -4,13 +4,13 @@
 subdir('VPD')
 generated_others += custom_target(
     'com/ibm/VPD__markdown'.underscorify(),
-    input: [ '../../../com/ibm/VPD.errors.yaml',  ],
+    input: [ '../../../yaml/com/ibm/VPD.errors.yaml',  ],
     output: [ 'VPD.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',
         'com/ibm/VPD',
     ],
 )