diff --git a/meson.build b/meson.build
index ddcb411..6cf1833 100644
--- a/meson.build
+++ b/meson.build
@@ -75,9 +75,9 @@
         cxx.find_library('ipl'),
     ]
     extra_unit_files = [
-        'set-spi-mux.service',
-        'phal-reinit-devtree.service',
-        'proc-pre-poweroff@.service',
+        'service_files/set-spi-mux.service',
+        'service_files/phal-reinit-devtree.service',
+        'service_files/proc-pre-poweroff@.service',
     ]
     unit_subs.set('ENABLE_PHAL_TRUE', '')
 endif
@@ -124,12 +124,12 @@
 )
 
 unit_files = [
-    'pcie-poweroff@.service',
-    'xyz.openbmc_project.Control.Host.NMI.service',
-    'op-stop-instructions@.service',
-    'op-cfam-reset.service',
-    'op-continue-mpreboot@.service',
-    'op-enter-mpreboot@.service',
+    'service_files/pcie-poweroff@.service',
+    'service_files/xyz.openbmc_project.Control.Host.NMI.service',
+    'service_files/op-stop-instructions@.service',
+    'service_files/op-cfam-reset.service',
+    'service_files/op-continue-mpreboot@.service',
+    'service_files/op-enter-mpreboot@.service',
 ] + extra_unit_files
 
 systemd_system_unit_dir = dependency('systemd').get_pkgconfig_variable(
@@ -141,7 +141,7 @@
         input: u + '.in',
         install: true,
         install_dir: systemd_system_unit_dir,
-        output: u
+        output: '@BASENAME@'
     )
 endforeach
 
diff --git a/op-cfam-reset.service.in b/service_files/op-cfam-reset.service.in
similarity index 100%
rename from op-cfam-reset.service.in
rename to service_files/op-cfam-reset.service.in
diff --git a/op-continue-mpreboot@.service.in b/service_files/op-continue-mpreboot@.service.in
similarity index 100%
rename from op-continue-mpreboot@.service.in
rename to service_files/op-continue-mpreboot@.service.in
diff --git a/op-enter-mpreboot@.service.in b/service_files/op-enter-mpreboot@.service.in
similarity index 100%
rename from op-enter-mpreboot@.service.in
rename to service_files/op-enter-mpreboot@.service.in
diff --git a/op-stop-instructions@.service.in b/service_files/op-stop-instructions@.service.in
similarity index 100%
rename from op-stop-instructions@.service.in
rename to service_files/op-stop-instructions@.service.in
diff --git a/pcie-poweroff@.service.in b/service_files/pcie-poweroff@.service.in
similarity index 100%
rename from pcie-poweroff@.service.in
rename to service_files/pcie-poweroff@.service.in
diff --git a/phal-reinit-devtree.service.in b/service_files/phal-reinit-devtree.service.in
similarity index 100%
rename from phal-reinit-devtree.service.in
rename to service_files/phal-reinit-devtree.service.in
diff --git a/proc-pre-poweroff@.service.in b/service_files/proc-pre-poweroff@.service.in
similarity index 100%
rename from proc-pre-poweroff@.service.in
rename to service_files/proc-pre-poweroff@.service.in
diff --git a/set-spi-mux.service.in b/service_files/set-spi-mux.service.in
similarity index 100%
rename from set-spi-mux.service.in
rename to service_files/set-spi-mux.service.in
diff --git a/xyz.openbmc_project.Control.Host.NMI.service.in b/service_files/xyz.openbmc_project.Control.Host.NMI.service.in
similarity index 100%
rename from xyz.openbmc_project.Control.Host.NMI.service.in
rename to service_files/xyz.openbmc_project.Control.Host.NMI.service.in