diff --git a/applications/test/fieldMapping/pipe1D/constant/polyMesh/blockMeshDict b/applications/test/fieldMapping/pipe1D/system/blockMeshDict
similarity index 100%
rename from applications/test/fieldMapping/pipe1D/constant/polyMesh/blockMeshDict
rename to applications/test/fieldMapping/pipe1D/system/blockMeshDict
diff --git a/applications/test/hexRef8/block/constant/polyMesh/blockMeshDict b/applications/test/hexRef8/block/system/blockMeshDict
similarity index 100%
rename from applications/test/hexRef8/block/constant/polyMesh/blockMeshDict
rename to applications/test/hexRef8/block/system/blockMeshDict
diff --git a/applications/test/patchRegion/cavity_pinched/constant/polyMesh/blockMeshDict b/applications/test/patchRegion/cavity_pinched/system/blockMeshDict
similarity index 100%
rename from applications/test/patchRegion/cavity_pinched/constant/polyMesh/blockMeshDict
rename to applications/test/patchRegion/cavity_pinched/system/blockMeshDict
diff --git a/applications/test/volField/cavity/constant/polyMesh/blockMeshDict b/applications/test/volField/cavity/system/blockMeshDict
similarity index 100%
rename from applications/test/volField/cavity/constant/polyMesh/blockMeshDict
rename to applications/test/volField/cavity/system/blockMeshDict
diff --git a/etc/templates/axisymmetricJet/constant/polyMesh/blockMeshDict b/etc/templates/axisymmetricJet/system/blockMeshDict
similarity index 100%
rename from etc/templates/axisymmetricJet/constant/polyMesh/blockMeshDict
rename to etc/templates/axisymmetricJet/system/blockMeshDict
diff --git a/etc/templates/closedVolume/constant/polyMesh/blockMeshDict b/etc/templates/closedVolume/system/blockMeshDict
similarity index 100%
rename from etc/templates/closedVolume/constant/polyMesh/blockMeshDict
rename to etc/templates/closedVolume/system/blockMeshDict
diff --git a/etc/templates/closedVolumeRotating/constant/polyMesh/blockMeshDict b/etc/templates/closedVolumeRotating/system/blockMeshDict
similarity index 100%
rename from etc/templates/closedVolumeRotating/constant/polyMesh/blockMeshDict
rename to etc/templates/closedVolumeRotating/system/blockMeshDict
diff --git a/etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict b/etc/templates/compressibleInflowOutflow/system/blockMeshDict
similarity index 100%
rename from etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict
rename to etc/templates/compressibleInflowOutflow/system/blockMeshDict
diff --git a/etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict b/etc/templates/inflowOutflow/system/blockMeshDict
similarity index 100%
rename from etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict
rename to etc/templates/inflowOutflow/system/blockMeshDict
diff --git a/etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict b/etc/templates/inflowOutflowRotating/system/blockMeshDict
similarity index 100%
rename from etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict
rename to etc/templates/inflowOutflowRotating/system/blockMeshDict