diff --git a/src/lumpedPointMotion/Make/files b/src/lumpedPointMotion/Make/files
index e39fbdbdb6..3125d35a6f 100644
--- a/src/lumpedPointMotion/Make/files
+++ b/src/lumpedPointMotion/Make/files
@@ -1,11 +1,12 @@
-lumpedPointMovement.C
-lumpedPointMovementWriter.C
-lumpedPointState.C
-lumpedPointStateWriter.C
-lumpedPointIOMovement.C
+state/lumpedPointState.C
+state/lumpedPointStateWriter.C
 
-lumpedPointDisplacementPointPatchVectorField.C
+movement/lumpedPointMovement.C
+movement/lumpedPointMovementWriter.C
+movement/lumpedPointIOMovement.C
 
-lumpedPointTools.C
+tools/lumpedPointTools.C
+
+pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
 
 LIB = $(FOAM_LIBBIN)/liblumpedPointMotion
diff --git a/src/lumpedPointMotion/lumpedPointMovement.dict b/src/lumpedPointMotion/lumpedPointMovementDict
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointMovement.dict
rename to src/lumpedPointMotion/lumpedPointMovementDict
diff --git a/src/lumpedPointMotion/lumpedPointIOMovement.C b/src/lumpedPointMotion/movement/lumpedPointIOMovement.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointIOMovement.C
rename to src/lumpedPointMotion/movement/lumpedPointIOMovement.C
diff --git a/src/lumpedPointMotion/lumpedPointIOMovement.H b/src/lumpedPointMotion/movement/lumpedPointIOMovement.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointIOMovement.H
rename to src/lumpedPointMotion/movement/lumpedPointIOMovement.H
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/movement/lumpedPointMovement.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointMovement.C
rename to src/lumpedPointMotion/movement/lumpedPointMovement.C
diff --git a/src/lumpedPointMotion/lumpedPointMovement.H b/src/lumpedPointMotion/movement/lumpedPointMovement.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointMovement.H
rename to src/lumpedPointMotion/movement/lumpedPointMovement.H
diff --git a/src/lumpedPointMotion/lumpedPointMovementI.H b/src/lumpedPointMotion/movement/lumpedPointMovementI.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointMovementI.H
rename to src/lumpedPointMotion/movement/lumpedPointMovementI.H
diff --git a/src/lumpedPointMotion/lumpedPointMovementWriter.C b/src/lumpedPointMotion/movement/lumpedPointMovementWriter.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointMovementWriter.C
rename to src/lumpedPointMotion/movement/lumpedPointMovementWriter.C
diff --git a/src/lumpedPointMotion/lumpedPointDisplacementPointPatchVectorField.C b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointDisplacementPointPatchVectorField.C
rename to src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.C
diff --git a/src/lumpedPointMotion/lumpedPointDisplacementPointPatchVectorField.H b/src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointDisplacementPointPatchVectorField.H
rename to src/lumpedPointMotion/pointPatchFields/lumpedPointDisplacementPointPatchVectorField.H
diff --git a/src/lumpedPointMotion/lumpedPointState.C b/src/lumpedPointMotion/state/lumpedPointState.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointState.C
rename to src/lumpedPointMotion/state/lumpedPointState.C
diff --git a/src/lumpedPointMotion/lumpedPointState.H b/src/lumpedPointMotion/state/lumpedPointState.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointState.H
rename to src/lumpedPointMotion/state/lumpedPointState.H
diff --git a/src/lumpedPointMotion/lumpedPointStateI.H b/src/lumpedPointMotion/state/lumpedPointStateI.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointStateI.H
rename to src/lumpedPointMotion/state/lumpedPointStateI.H
diff --git a/src/lumpedPointMotion/lumpedPointStateWriter.C b/src/lumpedPointMotion/state/lumpedPointStateWriter.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointStateWriter.C
rename to src/lumpedPointMotion/state/lumpedPointStateWriter.C
diff --git a/src/lumpedPointMotion/lumpedPointTools.C b/src/lumpedPointMotion/tools/lumpedPointTools.C
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointTools.C
rename to src/lumpedPointMotion/tools/lumpedPointTools.C
diff --git a/src/lumpedPointMotion/lumpedPointTools.H b/src/lumpedPointMotion/tools/lumpedPointTools.H
similarity index 100%
rename from src/lumpedPointMotion/lumpedPointTools.H
rename to src/lumpedPointMotion/tools/lumpedPointTools.H