diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files
index bba53da9e1..d78c9fa946 100644
--- a/src/surfMesh/Make/files
+++ b/src/surfMesh/Make/files
@@ -15,8 +15,8 @@ surfaceRegistry/surfaceRegistry.C
 surfMesh/surfMesh.C
 surfMesh/surfMeshClear.C
 surfMesh/surfMeshIO.C
-surfFields/surfFields/surfFields.C
-surfFields/surfPointFields/surfPointFields.C
+surfMesh/fields/surfFields.C
+surfMesh/fields/surfPointFields.C
 
 surfaceFormats = surfaceFormats
 $(surfaceFormats)/surfaceFormatsCore.C
diff --git a/src/surfMesh/surfFields/surfFields/surfFields.C b/src/surfMesh/surfMesh/fields/surfFields.C
similarity index 100%
rename from src/surfMesh/surfFields/surfFields/surfFields.C
rename to src/surfMesh/surfMesh/fields/surfFields.C
diff --git a/src/surfMesh/surfFields/surfFields/surfFields.H b/src/surfMesh/surfMesh/fields/surfFields.H
similarity index 100%
rename from src/surfMesh/surfFields/surfFields/surfFields.H
rename to src/surfMesh/surfMesh/fields/surfFields.H
diff --git a/src/surfMesh/surfFields/surfFields/surfFieldsFwd.H b/src/surfMesh/surfMesh/fields/surfFieldsFwd.H
similarity index 100%
rename from src/surfMesh/surfFields/surfFields/surfFieldsFwd.H
rename to src/surfMesh/surfMesh/fields/surfFieldsFwd.H
diff --git a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H b/src/surfMesh/surfMesh/fields/surfGeoMesh.H
similarity index 100%
rename from src/surfMesh/surfFields/surfFields/surfGeoMesh.H
rename to src/surfMesh/surfMesh/fields/surfGeoMesh.H
diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointFields.C b/src/surfMesh/surfMesh/fields/surfPointFields.C
similarity index 100%
rename from src/surfMesh/surfFields/surfPointFields/surfPointFields.C
rename to src/surfMesh/surfMesh/fields/surfPointFields.C
diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointFields.H b/src/surfMesh/surfMesh/fields/surfPointFields.H
similarity index 100%
rename from src/surfMesh/surfFields/surfPointFields/surfPointFields.H
rename to src/surfMesh/surfMesh/fields/surfPointFields.H
diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointFieldsFwd.H b/src/surfMesh/surfMesh/fields/surfPointFieldsFwd.H
similarity index 100%
rename from src/surfMesh/surfFields/surfPointFields/surfPointFieldsFwd.H
rename to src/surfMesh/surfMesh/fields/surfPointFieldsFwd.H
diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H b/src/surfMesh/surfMesh/fields/surfPointGeoMesh.H
similarity index 100%
rename from src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
rename to src/surfMesh/surfMesh/fields/surfPointGeoMesh.H