diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt
index f634ba49b9..584bd00069 100644
--- a/ApplicationLibCode/CMakeLists.txt
+++ b/ApplicationLibCode/CMakeLists.txt
@@ -99,6 +99,7 @@ list(
   ReservoirDataModel/ResultAccessors/CMakeLists_files.cmake
   ReservoirDataModel/ResultCalculators/CMakeLists_files.cmake
   ReservoirDataModel/Well/CMakeLists_files.cmake
+  ReservoirDataModel/Surface/CMakeLists_files.cmake
   FileInterface/CMakeLists_files.cmake
   ProjectDataModel/CMakeLists_files.cmake
   ProjectDataModel/AnalysisPlots/CMakeLists_files.cmake
diff --git a/ApplicationLibCode/Commands/SurfaceCommands/RicExportKLayerToPtlFeature.cpp b/ApplicationLibCode/Commands/SurfaceCommands/RicExportKLayerToPtlFeature.cpp
index b3b18b7ded..06dc28c3c8 100644
--- a/ApplicationLibCode/Commands/SurfaceCommands/RicExportKLayerToPtlFeature.cpp
+++ b/ApplicationLibCode/Commands/SurfaceCommands/RicExportKLayerToPtlFeature.cpp
@@ -21,7 +21,9 @@
 #include "RiaApplication.h"
 
 #include "RifSurfaceExporter.h"
-#include "RigSurface.h"
+
+#include "Surface/RigSurface.h"
+
 #include "RimGridCaseSurface.h"
 
 #include "Riu3DMainWindowTools.h"
diff --git a/ApplicationLibCode/Commands/SurfaceCommands/RicExportSurfaceToTsurfFeature.cpp b/ApplicationLibCode/Commands/SurfaceCommands/RicExportSurfaceToTsurfFeature.cpp
index 20c011c4c2..b2ad5cca8f 100644
--- a/ApplicationLibCode/Commands/SurfaceCommands/RicExportSurfaceToTsurfFeature.cpp
+++ b/ApplicationLibCode/Commands/SurfaceCommands/RicExportSurfaceToTsurfFeature.cpp
@@ -21,7 +21,8 @@
 #include "RiaApplication.h"
 
 #include "RifSurfaceExporter.h"
-#include "RigSurface.h"
+
+#include "Surface/RigSurface.h"
 
 #include "RimSurface.h"
 
diff --git a/ApplicationLibCode/FileInterface/RifSurfaceImporter.cpp b/ApplicationLibCode/FileInterface/RifSurfaceImporter.cpp
index 5d850f2064..d6e23f289c 100644
--- a/ApplicationLibCode/FileInterface/RifSurfaceImporter.cpp
+++ b/ApplicationLibCode/FileInterface/RifSurfaceImporter.cpp
@@ -17,8 +17,10 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RifSurfaceImporter.h"
+
 #include "RiaStdStringTools.h"
-#include "RigTriangleMeshData.h"
+
+#include "Surface/RigTriangleMeshData.h"
 
 #include "cafProgressInfo.h"
 
diff --git a/ApplicationLibCode/FileInterface/RifVtkSurfaceImporter.cpp b/ApplicationLibCode/FileInterface/RifVtkSurfaceImporter.cpp
index 09fdc0507d..e43c3a67f0 100644
--- a/ApplicationLibCode/FileInterface/RifVtkSurfaceImporter.cpp
+++ b/ApplicationLibCode/FileInterface/RifVtkSurfaceImporter.cpp
@@ -18,7 +18,7 @@
 
 #include "RifVtkSurfaceImporter.h"
 
-#include "RigTriangleMeshData.h"
+#include "Surface/RigTriangleMeshData.h"
 
 #include <filesystem>
 #include <memory>
diff --git a/ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp b/ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
index 1dc7597798..cfd3a6300c 100644
--- a/ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
+++ b/ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
@@ -21,8 +21,8 @@
 
 #include "RigMainGrid.h"
 #include "RigResultAccessor.h"
-#include "RigSurface.h"
-#include "RigSurfaceResampler.h"
+#include "Surface/RigSurface.h"
+#include "Surface/RigSurfaceResampler.h"
 
 #include "Rim3dView.h"
 #include "RimCase.h"
diff --git a/ApplicationLibCode/ModelVisualization/Seismic/RivSeismicSectionPartMgr.cpp b/ApplicationLibCode/ModelVisualization/Seismic/RivSeismicSectionPartMgr.cpp
index b53637764a..2937258633 100644
--- a/ApplicationLibCode/ModelVisualization/Seismic/RivSeismicSectionPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/Seismic/RivSeismicSectionPartMgr.cpp
@@ -29,8 +29,8 @@
 #include "RimSurfaceCollection.h"
 #include "RimTools.h"
 
-#include "RigSurfaceResampler.h"
 #include "RigTexturedSection.h"
+#include "Surface/RigSurfaceResampler.h"
 
 #include "RivAnnotationSourceInfo.h"
 #include "RivObjectSourceInfo.h"
diff --git a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
index a799cffe53..c0348bb59f 100644
--- a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
+++ b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
@@ -23,8 +23,8 @@
 
 #include "RigMainGrid.h"
 #include "RigResultAccessor.h"
+#include "Surface/RigSurface.h"
 
-#include "RigSurface.h"
 #include "Rim3dView.h"
 #include "RimCase.h"
 #include "RimGridView.h"
diff --git a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
index 0faa6f5081..71035d81d3 100644
--- a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
@@ -20,8 +20,9 @@
 
 #include "RiaPreferences.h"
 
+#include "Surface/RigSurface.h"
+
 #include "ProjectDataModel/RimCase.h"
-#include "RigSurface.h"
 #include "Rim3dView.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSurface.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimDepthSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimDepthSurface.cpp
index 0a339f7f34..057fc20968 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimDepthSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimDepthSurface.cpp
@@ -18,7 +18,7 @@
 
 #include "RimDepthSurface.h"
 
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "RimSurfaceCollection.h"
 
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp
index 71f4ef4360..ac3c9de3d7 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp
@@ -18,8 +18,9 @@
 
 #include "RimEnsembleStatisticsSurface.h"
 
-#include "RigSurface.h"
-#include "RigSurfaceStatisticsCalculator.h"
+#include "Surface/RigSurface.h"
+#include "Surface/RigSurfaceStatisticsCalculator.h"
+
 #include "RimEnsembleSurface.h"
 #include "RimSurfaceCollection.h"
 
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h
index 387e79620c..a013ba4436 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include "RigSurface.h"
-
-#include "RigSurfaceStatisticsCalculator.h"
+#include "Surface/RigSurface.h"
+#include "Surface/RigSurfaceStatisticsCalculator.h"
 
 #include "RimSurface.h"
+
 #include "cafAppEnum.h"
 
 class RimEnsembleStatisticsSurface : public RimSurface
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp
index 429a291e6f..cfc085f220 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp
@@ -21,8 +21,8 @@
 #include "RiaLogging.h"
 #include "RiaOptionItemFactory.h"
 
-#include "RigSurfaceResampler.h"
-#include "RigSurfaceStatisticsCalculator.h"
+#include "Surface/RigSurfaceResampler.h"
+#include "Surface/RigSurfaceStatisticsCalculator.h"
 
 #include "RimEnsembleCurveSet.h"
 #include "RimEnsembleStatisticsSurface.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h
index 493f78b7f4..9842a1b71e 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.h
@@ -20,7 +20,7 @@
 
 #include "RimSurfaceCollection.h"
 
-#include "RigSurfaceStatisticsCalculator.h"
+#include "Surface/RigSurfaceStatisticsCalculator.h"
 
 #include "cafPdmChildArrayField.h"
 #include "cafPdmPtrField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
index 1b3baa8fdc..6a75bbba3e 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp
@@ -25,8 +25,8 @@
 #include "RifSurfaceImporter.h"
 #include "RifVtkSurfaceImporter.h"
 
-#include "RigSurface.h"
-#include "RigTriangleMeshData.h"
+#include "Surface/RigSurface.h"
+#include "Surface/RigTriangleMeshData.h"
 
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmObjectScriptingCapability.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp
index 1d06f497ec..3df79c7935 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFractureSurface.cpp
@@ -21,8 +21,8 @@
 #include "RiaLogging.h"
 
 #include "RigStatisticsMath.h"
-#include "RigSurface.h"
-#include "RigTriangleMeshData.h"
+#include "Surface/RigSurface.h"
+#include "Surface/RigTriangleMeshData.h"
 
 #include "RimRegularLegendConfig.h"
 #include "RimSurfaceCollection.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp
index 032091cb3c..f98acbccde 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimGridCaseSurface.cpp
@@ -22,7 +22,7 @@
 #include "RigCaseCellResultsData.h"
 #include "RigMainGrid.h"
 #include "RigReservoirGridTools.h"
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "RimCase.h"
 #include "RimEclipseCase.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimRegularSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimRegularSurface.cpp
index a381764f2a..6600110b3e 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimRegularSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimRegularSurface.cpp
@@ -18,7 +18,7 @@
 
 #include "RimRegularSurface.h"
 
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "RimSurfaceCollection.h"
 
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp
index eba8c4c517..ef0e6e7241 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurface.cpp
@@ -26,7 +26,7 @@
 #include "RimSurfaceCollection.h"
 
 #include "RigStatisticsMath.h"
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmObjectScriptingCapability.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp
index ac63bf368e..59e83209ae 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp
@@ -20,7 +20,7 @@
 
 #include "RiaLogging.h"
 
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "RimEclipseView.h"
 #include "RimGeoMechView.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp
index 7841b0b5f6..5e4e6a77de 100644
--- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceResultDefinition.cpp
@@ -20,7 +20,7 @@
 
 #include "RiaResultNames.h"
 
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "Rim3dView.h"
 #include "RimRegularLegendConfig.h"
diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcSurface.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcSurface.cpp
index 9dc6f2cbfb..222e604608 100644
--- a/ApplicationLibCode/ProjectDataModelCommands/RimcSurface.cpp
+++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSurface.cpp
@@ -21,7 +21,7 @@
 #include "RimSurface.h"
 #include "RimcDataContainerString.h"
 
-#include "RigSurface.h"
+#include "Surface/RigSurface.h"
 
 #include "RifSurfaceExporter.h"
 
diff --git a/ApplicationLibCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationLibCode/ReservoirDataModel/CMakeLists_files.cmake
index 0a077a2acb..ce35a560ef 100644
--- a/ApplicationLibCode/ReservoirDataModel/CMakeLists_files.cmake
+++ b/ApplicationLibCode/ReservoirDataModel/CMakeLists_files.cmake
@@ -41,7 +41,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.h
     ${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.h
     ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigTriangleMeshData.h
     ${CMAKE_CURRENT_LIST_DIR}/RigGridBase.h
     ${CMAKE_CURRENT_LIST_DIR}/RigGridCrossPlotCurveGrouping.h
     ${CMAKE_CURRENT_LIST_DIR}/RigGriddedPart3d.h
@@ -63,9 +62,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigSlice2D.h
     ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.h
     ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanModelTools.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.h
     ${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RigTexturedSection.h
     ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureDefinition.h
@@ -126,7 +122,6 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigTriangleMeshData.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigGridBase.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigGriddedPart3d.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigGridManager.cpp
@@ -146,9 +141,6 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RigSlice2D.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigStimPlanModelTools.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigTexturedSection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RigThermalFractureDefinition.cpp
diff --git a/ApplicationLibCode/ReservoirDataModel/Surface/CMakeLists_files.cmake b/ApplicationLibCode/ReservoirDataModel/Surface/CMakeLists_files.cmake
new file mode 100644
index 0000000000..d0dba1c7c0
--- /dev/null
+++ b/ApplicationLibCode/ReservoirDataModel/Surface/CMakeLists_files.cmake
@@ -0,0 +1,16 @@
+set(SOURCE_GROUP_HEADER_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.h
+    ${CMAKE_CURRENT_LIST_DIR}/RigTriangleMeshData.h
+)
+
+set(SOURCE_GROUP_SOURCE_FILES
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurface.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RigTriangleMeshData.cpp
+)
+
+list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
+list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurface.cpp b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurface.cpp
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigSurface.cpp
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigSurface.cpp
diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurface.h b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurface.h
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigSurface.h
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigSurface.h
diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurfaceResampler.cpp b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceResampler.cpp
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigSurfaceResampler.cpp
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceResampler.cpp
diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurfaceResampler.h b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceResampler.h
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigSurfaceResampler.h
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceResampler.h
diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.cpp b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.cpp
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.cpp
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.cpp
diff --git a/ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.h b/ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.h
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigSurfaceStatisticsCalculator.h
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigSurfaceStatisticsCalculator.h
diff --git a/ApplicationLibCode/ReservoirDataModel/RigTriangleMeshData.cpp b/ApplicationLibCode/ReservoirDataModel/Surface/RigTriangleMeshData.cpp
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigTriangleMeshData.cpp
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigTriangleMeshData.cpp
diff --git a/ApplicationLibCode/ReservoirDataModel/RigTriangleMeshData.h b/ApplicationLibCode/ReservoirDataModel/Surface/RigTriangleMeshData.h
similarity index 100%
rename from ApplicationLibCode/ReservoirDataModel/RigTriangleMeshData.h
rename to ApplicationLibCode/ReservoirDataModel/Surface/RigTriangleMeshData.h
diff --git a/ApplicationLibCode/UnitTests/RifSurfaceImporter-Test.cpp b/ApplicationLibCode/UnitTests/RifSurfaceImporter-Test.cpp
index 11d696e78c..c9e294628f 100644
--- a/ApplicationLibCode/UnitTests/RifSurfaceImporter-Test.cpp
+++ b/ApplicationLibCode/UnitTests/RifSurfaceImporter-Test.cpp
@@ -3,7 +3,7 @@
 #include "RifSurfaceImporter.h"
 
 #include "RiaTestDataDirectory.h"
-#include "RigTriangleMeshData.h"
+#include "Surface/RigTriangleMeshData.h"
 
 #include "QDir"
 #include <QString>
diff --git a/ApplicationLibCode/UnitTests/RifVtkSurfaceImporter-Test.cpp b/ApplicationLibCode/UnitTests/RifVtkSurfaceImporter-Test.cpp
index d79e35dcde..466106b139 100644
--- a/ApplicationLibCode/UnitTests/RifVtkSurfaceImporter-Test.cpp
+++ b/ApplicationLibCode/UnitTests/RifVtkSurfaceImporter-Test.cpp
@@ -2,7 +2,7 @@
 
 #include "RiaTestDataDirectory.h"
 
-#include "RigTriangleMeshData.h"
+#include "Surface/RigTriangleMeshData.h"
 
 #include <gtest/gtest.h>
 
diff --git a/ApplicationLibCode/UnitTests/RigSurfaceResampler-Test.cpp b/ApplicationLibCode/UnitTests/RigSurfaceResampler-Test.cpp
index ee4046619a..40460fcb10 100644
--- a/ApplicationLibCode/UnitTests/RigSurfaceResampler-Test.cpp
+++ b/ApplicationLibCode/UnitTests/RigSurfaceResampler-Test.cpp
@@ -18,7 +18,8 @@
 
 #include "gtest/gtest.h"
 
-#include "RigSurfaceResampler.h"
+#include "Surface/RigSurfaceResampler.h"
+
 #include "cvfObject.h"
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UnitTests/RigSurfaceStatisticsCalculator-Test.cpp b/ApplicationLibCode/UnitTests/RigSurfaceStatisticsCalculator-Test.cpp
index 97cba8d31a..abf89a03e2 100644
--- a/ApplicationLibCode/UnitTests/RigSurfaceStatisticsCalculator-Test.cpp
+++ b/ApplicationLibCode/UnitTests/RigSurfaceStatisticsCalculator-Test.cpp
@@ -18,8 +18,8 @@
 
 #include "gtest/gtest.h"
 
-#include "RigSurface.h"
-#include "RigSurfaceStatisticsCalculator.h"
+#include "Surface/RigSurface.h"
+#include "Surface/RigSurfaceStatisticsCalculator.h"
 
 #include "cvfObject.h"