diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
index c26adb8a78..3a6cc4d74f 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allclean
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf constant/baffle3DRegion
+rm -rf constant/baffle3DRegion/polyMesh
 rm -rf 0
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
index 436c5575b0..7841a6add4 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
@@ -8,9 +8,6 @@ runApplication blockMesh
 
 cp -R 0.orig 0
 
-mkdir constant/baffle3DRegion
-cp 0/include/3DBaffle/physicalProperties constant/baffle3DRegion
-
 # Create 1D and 3D baffles
 runApplication createBaffles -overwrite
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/physicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/baffle3DRegion/physicalProperties
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/physicalProperties
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/baffle3DRegion/physicalProperties
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DTemperatureMasterBafflePatches
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DTemperatureMasterBafflePatches
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DTemperatureMasterBafflePatches
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DbaffleSolidThermo
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/1DBaffle/1DbaffleSolidThermo
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DTemperatureMasterBafflePatches
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DTemperatureMasterBafflePatches
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleRadiation b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DbaffleRadiation
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleRadiation
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/3DbaffleRadiation
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/extrudeModel
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/extrudeModel
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/3DBaffle/extrudeModel
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/baffle3DSetup
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/baffle3DSetup
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/wallBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/wallBafflePatches
similarity index 100%
rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/wallBafflePatches
rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/include/wallBafflePatches
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
index 8bcfc7c493..33aa51a8e5 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/createBafflesDict
@@ -35,13 +35,13 @@ baffles
             type            wall;
             patchFields
             {
-                #include "./0/include/wallBafflePatches"
-                #include "./0/include/1DBaffle/1DTemperatureMasterBafflePatches"
+                #include "./include/wallBafflePatches"
+                #include "./include/1DBaffle/1DTemperatureMasterBafflePatches"
             }
         }
     }
 
-    #include "./0/include/baffle3DSetup"
+    #include "./include/baffle3DSetup"
 
     baffleFacesThermoBaffle3D
     {
@@ -58,8 +58,8 @@ baffles
             sameGroup       off;
             patchFields
             {
-                #include "./0/include/wallBafflePatches"
-                #include "./0/include/3DBaffle/3DTemperatureMasterBafflePatches"
+                #include "./include/wallBafflePatches"
+                #include "./include/3DBaffle/3DTemperatureMasterBafflePatches"
             }
         }
     }