diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allclean
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allrun
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0/U
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/0/U
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0/U
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/RASProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/RASProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/g
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/blockMeshDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/boundary b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/boundary
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/boundary
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/transportProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/turbulenceProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/decomposeParDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSchemes
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSolution
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/mapFieldsDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/0/U
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/RASProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/RASProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/g
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudPositions
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/blockMeshDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/boundary b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/boundary
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/transportProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/turbulenceProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/controlDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/decomposeParDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSchemes
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSolution
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution