diff --git a/src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchField.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchField.C
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchField.C
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchField.C
diff --git a/src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchField.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchField.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchField.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchField.H
diff --git a/src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchFields.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchFields.C
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchFields.C
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchFields.C
diff --git a/src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchFields.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchFields.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchFields.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchFields.H
diff --git a/src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchFieldsFwd.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchFieldsFwd.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/mixedIbFvPatchField/mixedIbFvPatchFieldsFwd.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/basic/mixedIbFvPatchField/mixedIbFvPatchFieldsFwd.H
diff --git a/src/immersedBoundary/immersedBoundary/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/derived/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.C
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.C
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/derived/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.C
diff --git a/src/immersedBoundary/immersedBoundary/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/derived/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/derived/movingImmersedBoundaryVelocity/movingImmersedBoundaryVelocityFvPatchVectorField.H
diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.C
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.C
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.C
diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchField.H
diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.C b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.C
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.C
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.C
diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFields.H
diff --git a/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFieldsFwd.H b/src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFieldsFwd.H
similarity index 100%
rename from src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFieldsFwd.H
rename to src/immersedBoundary/immersedBoundary/immersedBoundaryFvPatchFields/immersedBoundaryFvPatchField/immersedBoundaryFvPatchFieldsFwd.H