diff --git a/src/Allwmake b/src/Allwmake
index e7fb45896c..9d5184e56c 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -76,6 +76,7 @@ wmake $targetType regionCoupled
 functionObjects/Allwmake $targetType $*
 
 wmake $targetType sixDoFRigidBodyMotion
+wmake $targetType sixDoFRigidBodyState
 wmake $targetType rigidBodyDynamics
 wmake $targetType rigidBodyMeshMotion
 wmake $targetType waves
diff --git a/src/functionObjects/Allwmake b/src/functionObjects/Allwmake
index d426403f17..e2b688a680 100755
--- a/src/functionObjects/Allwmake
+++ b/src/functionObjects/Allwmake
@@ -9,6 +9,5 @@ wmake $targetType forces
 wmake $targetType lagrangian
 wmake $targetType utilities
 wmake $targetType solvers
-wmake $targetType sixDoFRigidBodyState
 
 #------------------------------------------------------------------------------
diff --git a/src/functionObjects/sixDoFRigidBodyState/Make/files b/src/sixDoFRigidBodyState/Make/files
similarity index 100%
rename from src/functionObjects/sixDoFRigidBodyState/Make/files
rename to src/sixDoFRigidBodyState/Make/files
diff --git a/src/functionObjects/sixDoFRigidBodyState/Make/options b/src/sixDoFRigidBodyState/Make/options
similarity index 100%
rename from src/functionObjects/sixDoFRigidBodyState/Make/options
rename to src/sixDoFRigidBodyState/Make/options
diff --git a/src/functionObjects/sixDoFRigidBodyState/sixDoFRigidBodyState.C b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
similarity index 100%
rename from src/functionObjects/sixDoFRigidBodyState/sixDoFRigidBodyState.C
rename to src/sixDoFRigidBodyState/sixDoFRigidBodyState.C
diff --git a/src/functionObjects/sixDoFRigidBodyState/sixDoFRigidBodyState.H b/src/sixDoFRigidBodyState/sixDoFRigidBodyState.H
similarity index 100%
rename from src/functionObjects/sixDoFRigidBodyState/sixDoFRigidBodyState.H
rename to src/sixDoFRigidBodyState/sixDoFRigidBodyState.H