diff --git a/src/devicetree_vpd_parser.cpp b/src/devicetree_vpd_parser/devicetree_vpd_parser.cpp
similarity index 100%
rename from src/devicetree_vpd_parser.cpp
rename to src/devicetree_vpd_parser/devicetree_vpd_parser.cpp
diff --git a/src/machine_context.cpp b/src/devicetree_vpd_parser/machine_context.cpp
similarity index 100%
rename from src/machine_context.cpp
rename to src/devicetree_vpd_parser/machine_context.cpp
diff --git a/src/machine_context.hpp b/src/devicetree_vpd_parser/machine_context.hpp
similarity index 100%
rename from src/machine_context.hpp
rename to src/devicetree_vpd_parser/machine_context.hpp
diff --git a/src/devicetree_vpd_parser/meson.build b/src/devicetree_vpd_parser/meson.build
new file mode 100644
index 0000000..93e6f98
--- /dev/null
+++ b/src/devicetree_vpd_parser/meson.build
@@ -0,0 +1,11 @@
+cpp_args_fd = cpp_args
+executable(
+    'devicetree-vpd-parser',
+    'machine_context.cpp',
+    'devicetree_vpd_parser.cpp',
+    cpp_args: cpp_args_fd,
+    dependencies: [sdbusplus, phosphor_dbus_interfaces_dep],
+    install: true,
+    install_dir: installdir,
+)
+
diff --git a/src/meson.build b/src/meson.build
index 8334e7e..2f98faf 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -9,14 +9,5 @@
 endif
 
 if get_option('devicetree-vpd')
-    cpp_args_fd = cpp_args
-    executable(
-        'devicetree-vpd-parser',
-        'machine_context.cpp',
-        'devicetree_vpd_parser.cpp',
-        cpp_args: cpp_args_fd,
-        dependencies: [sdbusplus, phosphor_dbus_interfaces_dep],
-        install: true,
-        install_dir: installdir,
-    )
+    subdir('devicetree_vpd_parser')
 endif