diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/CH4 b/validationCases/02_flameWallInteraction/0/CH4
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/CH4
rename to validationCases/02_flameWallInteraction/0/CH4
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/CO2 b/validationCases/02_flameWallInteraction/0/CO2
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/CO2
rename to validationCases/02_flameWallInteraction/0/CO2
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/H2O b/validationCases/02_flameWallInteraction/0/H2O
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/H2O
rename to validationCases/02_flameWallInteraction/0/H2O
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/N2 b/validationCases/02_flameWallInteraction/0/N2
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/N2
rename to validationCases/02_flameWallInteraction/0/N2
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/O2 b/validationCases/02_flameWallInteraction/0/O2
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/O2
rename to validationCases/02_flameWallInteraction/0/O2
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/T b/validationCases/02_flameWallInteraction/0/T
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/T
rename to validationCases/02_flameWallInteraction/0/T
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/U b/validationCases/02_flameWallInteraction/0/U
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/U
rename to validationCases/02_flameWallInteraction/0/U
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/Ydefault b/validationCases/02_flameWallInteraction/0/Ydefault
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/Ydefault
rename to validationCases/02_flameWallInteraction/0/Ydefault
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/p b/validationCases/02_flameWallInteraction/0/p
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/p
rename to validationCases/02_flameWallInteraction/0/p
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/p_rgh b/validationCases/02_flameWallInteraction/0/p_rgh
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/p_rgh
rename to validationCases/02_flameWallInteraction/0/p_rgh
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/0/uniform/time b/validationCases/02_flameWallInteraction/0/uniform/time
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/0/uniform/time
rename to validationCases/02_flameWallInteraction/0/uniform/time
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/Allclean b/validationCases/02_flameWallInteraction/Allclean
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/Allclean
rename to validationCases/02_flameWallInteraction/Allclean
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/Allrun b/validationCases/02_flameWallInteraction/Allrun
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/Allrun
rename to validationCases/02_flameWallInteraction/Allrun
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/chem.inp b/validationCases/02_flameWallInteraction/chemkin/chem.inp
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/chem.inp
rename to validationCases/02_flameWallInteraction/chemkin/chem.inp
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/therm.dat b/validationCases/02_flameWallInteraction/chemkin/therm.dat
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/therm.dat
rename to validationCases/02_flameWallInteraction/chemkin/therm.dat
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/tran.dat b/validationCases/02_flameWallInteraction/chemkin/tran.dat
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/tran.dat
rename to validationCases/02_flameWallInteraction/chemkin/tran.dat
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/transportProperties b/validationCases/02_flameWallInteraction/chemkin/transportProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/chemkin/transportProperties
rename to validationCases/02_flameWallInteraction/chemkin/transportProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/chemistryProperties b/validationCases/02_flameWallInteraction/constant/flame/chemistryProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/chemistryProperties
rename to validationCases/02_flameWallInteraction/constant/flame/chemistryProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/combustionProperties b/validationCases/02_flameWallInteraction/constant/flame/combustionProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/combustionProperties
rename to validationCases/02_flameWallInteraction/constant/flame/combustionProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/g b/validationCases/02_flameWallInteraction/constant/flame/g
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/g
rename to validationCases/02_flameWallInteraction/constant/flame/g
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/radiationProperties b/validationCases/02_flameWallInteraction/constant/flame/radiationProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/radiationProperties
rename to validationCases/02_flameWallInteraction/constant/flame/radiationProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/reactions b/validationCases/02_flameWallInteraction/constant/flame/reactions
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/reactions
rename to validationCases/02_flameWallInteraction/constant/flame/reactions
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/thermo.compressibleGas b/validationCases/02_flameWallInteraction/constant/flame/thermo.compressibleGas
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/thermo.compressibleGas
rename to validationCases/02_flameWallInteraction/constant/flame/thermo.compressibleGas
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/thermophysicalProperties b/validationCases/02_flameWallInteraction/constant/flame/thermophysicalProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/thermophysicalProperties
rename to validationCases/02_flameWallInteraction/constant/flame/thermophysicalProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/turbulenceProperties b/validationCases/02_flameWallInteraction/constant/flame/turbulenceProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/flame/turbulenceProperties
rename to validationCases/02_flameWallInteraction/constant/flame/turbulenceProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/regionProperties b/validationCases/02_flameWallInteraction/constant/regionProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/regionProperties
rename to validationCases/02_flameWallInteraction/constant/regionProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/constant/solid/thermophysicalProperties b/validationCases/02_flameWallInteraction/constant/solid/thermophysicalProperties
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/constant/solid/thermophysicalProperties
rename to validationCases/02_flameWallInteraction/constant/solid/thermophysicalProperties
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/README b/validationCases/02_flameWallInteraction/system/README
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/README
rename to validationCases/02_flameWallInteraction/system/README
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/blockMeshDict b/validationCases/02_flameWallInteraction/system/blockMeshDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/blockMeshDict
rename to validationCases/02_flameWallInteraction/system/blockMeshDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/controlDict b/validationCases/02_flameWallInteraction/system/controlDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/controlDict
rename to validationCases/02_flameWallInteraction/system/controlDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/decomposeParDict b/validationCases/02_flameWallInteraction/system/decomposeParDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/decomposeParDict
rename to validationCases/02_flameWallInteraction/system/decomposeParDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/changeDictionaryDict b/validationCases/02_flameWallInteraction/system/flame/changeDictionaryDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/changeDictionaryDict
rename to validationCases/02_flameWallInteraction/system/flame/changeDictionaryDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/decomposeParDict b/validationCases/02_flameWallInteraction/system/flame/decomposeParDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/decomposeParDict
rename to validationCases/02_flameWallInteraction/system/flame/decomposeParDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/fvSchemes b/validationCases/02_flameWallInteraction/system/flame/fvSchemes
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/fvSchemes
rename to validationCases/02_flameWallInteraction/system/flame/fvSchemes
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/fvSolution b/validationCases/02_flameWallInteraction/system/flame/fvSolution
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/fvSolution
rename to validationCases/02_flameWallInteraction/system/flame/fvSolution
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/setFieldsDict b/validationCases/02_flameWallInteraction/system/flame/setFieldsDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/flame/setFieldsDict
rename to validationCases/02_flameWallInteraction/system/flame/setFieldsDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/fvSchemes b/validationCases/02_flameWallInteraction/system/fvSchemes
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/fvSchemes
rename to validationCases/02_flameWallInteraction/system/fvSchemes
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/fvSolution b/validationCases/02_flameWallInteraction/system/fvSolution
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/fvSolution
rename to validationCases/02_flameWallInteraction/system/fvSolution
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/sampleDict b/validationCases/02_flameWallInteraction/system/sampleDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/sampleDict
rename to validationCases/02_flameWallInteraction/system/sampleDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/singleGraph1 b/validationCases/02_flameWallInteraction/system/singleGraph1
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/singleGraph1
rename to validationCases/02_flameWallInteraction/system/singleGraph1
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/singleGraph2 b/validationCases/02_flameWallInteraction/system/singleGraph2
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/singleGraph2
rename to validationCases/02_flameWallInteraction/system/singleGraph2
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/changeDictionaryDict b/validationCases/02_flameWallInteraction/system/solid/changeDictionaryDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/changeDictionaryDict
rename to validationCases/02_flameWallInteraction/system/solid/changeDictionaryDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/decomposeParDict b/validationCases/02_flameWallInteraction/system/solid/decomposeParDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/decomposeParDict
rename to validationCases/02_flameWallInteraction/system/solid/decomposeParDict
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/fvSchemes b/validationCases/02_flameWallInteraction/system/solid/fvSchemes
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/fvSchemes
rename to validationCases/02_flameWallInteraction/system/solid/fvSchemes
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/fvSolution b/validationCases/02_flameWallInteraction/system/solid/fvSolution
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/solid/fvSolution
rename to validationCases/02_flameWallInteraction/system/solid/fvSolution
diff --git a/validationCases/02_flameWallInteraction/ofCaseSetup/system/topoSetDict b/validationCases/02_flameWallInteraction/system/topoSetDict
similarity index 100%
rename from validationCases/02_flameWallInteraction/ofCaseSetup/system/topoSetDict
rename to validationCases/02_flameWallInteraction/system/topoSetDict