diff --git a/meson.build b/meson.build
index 5139e3e..8524d33 100644
--- a/meson.build
+++ b/meson.build
@@ -182,33 +182,27 @@
 udev_dir = dependency('udev').get_variable(
         'udev_dir')
 
-install_data(
-    'ibm_vpd/system-vpd.service',
-    install_dir: systemd_system_unit_dir)
+rules = ['rules/70-ibm-vpd-parser.rules']
 
-install_data(
-    'ibm_vpd/ibm-vpd-parser@.service',
-    install_dir: systemd_system_unit_dir)
+install_data(rules, install_mode: 'rw-r--r--', install_dir: udev_dir/'rules.d')
 
-install_data(
-    'ibm_vpd/com.ibm.VPD.Manager.service',
-    install_dir: systemd_system_unit_dir)
+services = ['service_files/system-vpd.service',
+            'service_files/ibm-vpd-parser@.service',
+            'service_files/com.ibm.VPD.Manager.service',
+            'service_files/wait-vpd-parsers.service',
+            'service_files/ibm-isdimm-vpd-parser@.service',
+            'service_files/ibm-spi-vpd-parser@.service']
 
-install_data(
-    'ibm_vpd/wait-vpd-parsers.service',
-    install_dir: systemd_system_unit_dir)
+install_data(services, install_dir: systemd_system_unit_dir)
 
-install_data(
-    'ibm_vpd/wait-vpd-parsers.sh',
+scripts = ['scripts/wait-vpd-parsers.sh']
+
+install_data(scripts,
     install_mode: 'rwxr-xr-x',
     install_dir: get_option('bindir'))
 
-install_data(
-    ['ibm_vpd/70-ibm-vpd-parser.rules'],
-    install_dir: udev_dir / 'rules.d')
-
 package_datadir = join_paths('share', 'vpd')
-install_subdir('ibm_vpd/fru/', install_dir: package_datadir, strip_directory: true)
+install_subdir('config/ibm', install_dir: package_datadir, strip_directory: true)
 
 else
         FRUGEN = '$srcdir/extra-properties.py -e' + get_option('FRU_YAML')
diff --git a/ibm_vpd/70-ibm-vpd-parser.rules b/rules/70-ibm-vpd-parser.rules
similarity index 100%
rename from ibm_vpd/70-ibm-vpd-parser.rules
rename to rules/70-ibm-vpd-parser.rules
diff --git a/ibm_vpd/wait-vpd-parsers.sh b/scripts/wait-vpd-parsers.sh
similarity index 88%
rename from ibm_vpd/wait-vpd-parsers.sh
rename to scripts/wait-vpd-parsers.sh
index 4f479da..67ba05a 100644
--- a/ibm_vpd/wait-vpd-parsers.sh
+++ b/scripts/wait-vpd-parsers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 retries=100
-echo "Checking every 2s for active VPD parsers..."
+echo "Checking every 2s for active VPD parsers...."
 while [ "$retries" -ne 0 ]
 do
     sleep 2
diff --git a/ibm_vpd/com.ibm.VPD.Manager.service b/service_files/com.ibm.VPD.Manager.service
similarity index 100%
rename from ibm_vpd/com.ibm.VPD.Manager.service
rename to service_files/com.ibm.VPD.Manager.service
diff --git a/service_files/ibm-isdimm-vpd-parser@.service b/service_files/ibm-isdimm-vpd-parser@.service
new file mode 100644
index 0000000..d92ee52
--- /dev/null
+++ b/service_files/ibm-isdimm-vpd-parser@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Jedec format VPD Parser service for FRU %I
+Wants=mapper-wait@-xyz-openbmc_project-inventory.service
+After=mapper-wait@-xyz-openbmc_project-inventory.service
+Requires=system-vpd.service
+After=system-vpd.service
+Before=phosphor-discover-system-state@0.service
+
+[Service]
+ExecStart=/usr/bin/env ibm-read-vpd --file %f --driver ee1004
+SyslogIdentifier=ibm-isdimm-vpd-parser
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service_files/ibm-spi-vpd-parser@.service b/service_files/ibm-spi-vpd-parser@.service
new file mode 100644
index 0000000..eaecbbc
--- /dev/null
+++ b/service_files/ibm-spi-vpd-parser@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description= IPZ format SPI VPD Parser service for FRU %I
+Wants=mapper-wait@-xyz-openbmc_project-inventory.service
+After=mapper-wait@-xyz-openbmc_project-inventory.service
+Requires=system-vpd.service
+After=system-vpd.service
+Before=phosphor-discover-system-state@0.service
+
+[Service]
+ExecStart=/usr/bin/env ibm-read-vpd --file %f --driver at25
+SyslogIdentifier=ibm-spi-vpd-parser
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ibm_vpd/ibm-vpd-parser@.service b/service_files/ibm-vpd-parser@.service
similarity index 100%
rename from ibm_vpd/ibm-vpd-parser@.service
rename to service_files/ibm-vpd-parser@.service
diff --git a/ibm_vpd/system-vpd.service b/service_files/system-vpd.service
similarity index 100%
rename from ibm_vpd/system-vpd.service
rename to service_files/system-vpd.service
diff --git a/ibm_vpd/wait-vpd-parsers.service b/service_files/wait-vpd-parsers.service
similarity index 100%
rename from ibm_vpd/wait-vpd-parsers.service
rename to service_files/wait-vpd-parsers.service