diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPostSafetygamma07Pmax.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetygamma07Pmax.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPostSafetygamma07Pmax.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetygamma07Pmax.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPostSafetygamma07Pmin.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetygamma07Pmin.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPostSafetygamma07Pmin.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetygamma07Pmin.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPostSafetylambda07Pmax.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetylambda07Pmax.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPostSafetylambda07Pmax.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetylambda07Pmax.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPostSafetylambda07Pmin.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetylambda07Pmin.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPostSafetylambda07Pmin.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPostSafetylambda07Pmin.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPreSafetygamma08Pmax.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetygamma08Pmax.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPreSafetygamma08Pmax.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetygamma08Pmax.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPreSafetygamma08Pmin.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetygamma08Pmin.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPreSafetygamma08Pmin.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetygamma08Pmin.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPreSafetylambda08Pmax.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetylambda08Pmax.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPreSafetylambda08Pmax.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetylambda08Pmax.shield
diff --git a/resources/examples/testfiles/mdp-shields/dieSelectionPreSafetylambda08Pmin.shield b/resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetylambda08Pmin.shield
similarity index 100%
rename from resources/examples/testfiles/mdp-shields/dieSelectionPreSafetylambda08Pmin.shield
rename to resources/examples/testfiles/shields/mdp-shields/dieSelectionPreSafetylambda08Pmin.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma05PmaxF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma05PmaxF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma05PmaxF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma05PmaxF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma05PminF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma05PminF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma05PminF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma05PminF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma09PmaxF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma09PmaxF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma09PmaxF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma09PmaxF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma09PminF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma09PminF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyGamma09PminF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyGamma09PminF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda05PmaxF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda05PmaxF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda05PmaxF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda05PmaxF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda05PminF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda05PminF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda05PminF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda05PminF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda09PmaxF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda09PmaxF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda09PmaxF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda09PmaxF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda09PminF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda09PminF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPostSafetyLambda09PminF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPostSafetyLambda09PminF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma05PmaxF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma05PmaxF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma05PmaxF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma05PmaxF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma05PminF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma05PminF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma05PminF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma05PminF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma09PmaxF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma09PmaxF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma09PmaxF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma09PmaxF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma09PminF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma09PminF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyGamma09PminF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyGamma09PminF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda05PmaxF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda05PmaxF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda05PmaxF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda05PmaxF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda05PminF5.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda05PminF5.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda05PminF5.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda05PminF5.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda09PmaxF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda09PmaxF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda09PmaxF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda09PmaxF3.shield
diff --git a/resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda09PminF3.shield b/resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda09PminF3.shield
similarity index 100%
rename from resources/examples/testfiles/smg-shields/rightDecisionPreSafetyLambda09PminF3.shield
rename to resources/examples/testfiles/shields/smg-shields/rightDecisionPreSafetyLambda09PminF3.shield