diff --git a/meson.build b/meson.build
index 9b00bf4..e7a117a 100644
--- a/meson.build
+++ b/meson.build
@@ -75,9 +75,18 @@
 subdir('configurations')
 
 filepaths = []
+package_configdir = join_paths(packagedir, 'configurations')
+fs = import('fs')
+
 foreach c : configs
     file = join_paths('configurations', c)
-    install_data(file, install_dir: join_paths(packagedir, 'configurations'))
+    install_data(
+        file,
+        install_dir: join_paths(
+            package_configdir,
+            fs.parent(fs.relative_to(file, 'configurations')),
+        ),
+    )
     filepaths += [file]
 endforeach
 
diff --git a/src/utils.cpp b/src/utils.cpp
index 116c484..0d3a6d0 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -68,8 +68,14 @@
             continue;
         }
 
-        for (const auto& p : fs::directory_iterator(dirPath))
+        for (const auto& p : fs::recursive_directory_iterator(dirPath))
         {
+            std::error_code ec;
+            if (p.is_directory(ec))
+            {
+                continue;
+            }
+
             std::string path = p.path().string();
             if (std::regex_search(path, match, search))
             {