diff --git a/configurations/meson.build b/configurations/meson.build
index 0dec6f6..c680120 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -122,21 +122,21 @@
     'meta/harma/harma_mb.json',
     'meta/harma/harma_mb_vr_infineon.json',
     'meta/harma/harma_scm.json',
-    'meta/minerva_aegis.json',
-    'meta/minerva_cmm.json',
-    'meta/minerva_cmm_bsm.json',
-    'meta/minerva_cmm_hsc_infineon.json',
-    'meta/minerva_cmm_misc_boards.json',
-    'meta/minerva_cmm_scm.json',
-    'meta/minerva_fanboard_adc_silergy.json',
-    'meta/minerva_fanboard_adc_ti.json',
-    'meta/minerva_fanboard_misc.json',
-    'meta/minerva_janga_smb.json',
-    'meta/minerva_pdb.json',
-    'meta/minerva_pdb_hsc_xdp.json',
-    'meta/minerva_pttv.json',
-    'meta/minerva_sitv.json',
-    'meta/minerva_tahan_smb.json',
+    'meta/minerva/minerva_aegis.json',
+    'meta/minerva/minerva_cmm.json',
+    'meta/minerva/minerva_cmm_bsm.json',
+    'meta/minerva/minerva_cmm_hsc_infineon.json',
+    'meta/minerva/minerva_cmm_misc_boards.json',
+    'meta/minerva/minerva_cmm_scm.json',
+    'meta/minerva/minerva_fanboard_adc_silergy.json',
+    'meta/minerva/minerva_fanboard_adc_ti.json',
+    'meta/minerva/minerva_fanboard_misc.json',
+    'meta/minerva/minerva_janga_smb.json',
+    'meta/minerva/minerva_pdb.json',
+    'meta/minerva/minerva_pdb_hsc_xdp.json',
+    'meta/minerva/minerva_pttv.json',
+    'meta/minerva/minerva_sitv.json',
+    'meta/minerva/minerva_tahan_smb.json',
     'meta/santabarbara_e1s_bp.json',
     'meta/santabarbara_evb_pdb2.json',
     'meta/santabarbara_mb.json',
diff --git a/configurations/meta/minerva_aegis.json b/configurations/meta/minerva/minerva_aegis.json
similarity index 100%
rename from configurations/meta/minerva_aegis.json
rename to configurations/meta/minerva/minerva_aegis.json
diff --git a/configurations/meta/minerva_cmm.json b/configurations/meta/minerva/minerva_cmm.json
similarity index 100%
rename from configurations/meta/minerva_cmm.json
rename to configurations/meta/minerva/minerva_cmm.json
diff --git a/configurations/meta/minerva_cmm_bsm.json b/configurations/meta/minerva/minerva_cmm_bsm.json
similarity index 100%
rename from configurations/meta/minerva_cmm_bsm.json
rename to configurations/meta/minerva/minerva_cmm_bsm.json
diff --git a/configurations/meta/minerva_cmm_hsc_infineon.json b/configurations/meta/minerva/minerva_cmm_hsc_infineon.json
similarity index 100%
rename from configurations/meta/minerva_cmm_hsc_infineon.json
rename to configurations/meta/minerva/minerva_cmm_hsc_infineon.json
diff --git a/configurations/meta/minerva_cmm_misc_boards.json b/configurations/meta/minerva/minerva_cmm_misc_boards.json
similarity index 100%
rename from configurations/meta/minerva_cmm_misc_boards.json
rename to configurations/meta/minerva/minerva_cmm_misc_boards.json
diff --git a/configurations/meta/minerva_cmm_scm.json b/configurations/meta/minerva/minerva_cmm_scm.json
similarity index 100%
rename from configurations/meta/minerva_cmm_scm.json
rename to configurations/meta/minerva/minerva_cmm_scm.json
diff --git a/configurations/meta/minerva_fanboard_adc_silergy.json b/configurations/meta/minerva/minerva_fanboard_adc_silergy.json
similarity index 100%
rename from configurations/meta/minerva_fanboard_adc_silergy.json
rename to configurations/meta/minerva/minerva_fanboard_adc_silergy.json
diff --git a/configurations/meta/minerva_fanboard_adc_ti.json b/configurations/meta/minerva/minerva_fanboard_adc_ti.json
similarity index 100%
rename from configurations/meta/minerva_fanboard_adc_ti.json
rename to configurations/meta/minerva/minerva_fanboard_adc_ti.json
diff --git a/configurations/meta/minerva_fanboard_misc.json b/configurations/meta/minerva/minerva_fanboard_misc.json
similarity index 100%
rename from configurations/meta/minerva_fanboard_misc.json
rename to configurations/meta/minerva/minerva_fanboard_misc.json
diff --git a/configurations/meta/minerva_janga_smb.json b/configurations/meta/minerva/minerva_janga_smb.json
similarity index 100%
rename from configurations/meta/minerva_janga_smb.json
rename to configurations/meta/minerva/minerva_janga_smb.json
diff --git a/configurations/meta/minerva_pdb.json b/configurations/meta/minerva/minerva_pdb.json
similarity index 100%
rename from configurations/meta/minerva_pdb.json
rename to configurations/meta/minerva/minerva_pdb.json
diff --git a/configurations/meta/minerva_pdb_hsc_xdp.json b/configurations/meta/minerva/minerva_pdb_hsc_xdp.json
similarity index 100%
rename from configurations/meta/minerva_pdb_hsc_xdp.json
rename to configurations/meta/minerva/minerva_pdb_hsc_xdp.json
diff --git a/configurations/meta/minerva_pttv.json b/configurations/meta/minerva/minerva_pttv.json
similarity index 100%
rename from configurations/meta/minerva_pttv.json
rename to configurations/meta/minerva/minerva_pttv.json
diff --git a/configurations/meta/minerva_sitv.json b/configurations/meta/minerva/minerva_sitv.json
similarity index 100%
rename from configurations/meta/minerva_sitv.json
rename to configurations/meta/minerva/minerva_sitv.json
diff --git a/configurations/meta/minerva_tahan_smb.json b/configurations/meta/minerva/minerva_tahan_smb.json
similarity index 100%
rename from configurations/meta/minerva_tahan_smb.json
rename to configurations/meta/minerva/minerva_tahan_smb.json