diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 5fd4c0cd30..92f37b4659 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -86,6 +86,7 @@ list( APPEND CPP_SOURCES
     ProjectDataModel/RimUiTreeModelPdm.cpp
     ProjectDataModel/RimUiTreeView.cpp
 	ProjectDataModel/RimReservoirCellResultsCacher.cpp
+	ProjectDataModel/RigStatistics.cpp
 )
 
 # Populate the filenames into variable lists
@@ -153,20 +154,20 @@ qt4_add_resources( QRC_FILES_CPP ${QRC_FILES} )
 #############################################################################
 
 set( RAW_SOURCES ${CPP_SOURCES} )
-list( REMOVE_ITEM RAW_SOURCES RIStdInclude.cpp)
-list( REMOVE_ITEM RAW_SOURCES ${CODE_SOURCE_FILES})
 
-list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivCellEdgeEffectGenerator.cpp)
-list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivPipeGeometryGenerator.cpp)
-list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivWellPipesPartMgr.cpp)
-list( REMOVE_ITEM RAW_SOURCES ModelVisualization/RivWellHeadPartMgr.cpp)
+list( REMOVE_ITEM RAW_SOURCES 
+	RIStdInclude.cpp
 
-list( REMOVE_ITEM RAW_SOURCES Application/RiaImageFileCompare.cpp)
-list( REMOVE_ITEM RAW_SOURCES Application/RiaImageCompareReporter.cpp)
+	${CODE_SOURCE_FILES}
 
-
-
-list( REMOVE_ITEM RAW_SOURCES     
+	ModelVisualization/RivCellEdgeEffectGenerator.cpp
+	ModelVisualization/RivPipeGeometryGenerator.cpp
+	ModelVisualization/RivWellPipesPartMgr.cpp
+	ModelVisualization/RivWellHeadPartMgr.cpp
+	
+	Application/RiaImageFileCompare.cpp
+	Application/RiaImageCompareReporter.cpp
+	    
     FileInterface/RifEclipseInputFileTools.cpp
     FileInterface/RifEclipseOutputFileTools.cpp
     FileInterface/RifEclipseRestartFilesetAccess.cpp
@@ -174,9 +175,9 @@ list( REMOVE_ITEM RAW_SOURCES
     FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
     FileInterface/RifReaderEclipseInput.cpp
     FileInterface/RifReaderEclipseOutput.cpp
+
     UserInterface/RiuSimpleHistogramWidget.cpp
     UserInterface/RiuMultiCaseImportDialog.cpp
-
 )
 
 include( CustomPCH.cmake )
diff --git a/ApplicationCode/ReservoirDataModel/RigStatistics.cpp b/ApplicationCode/ProjectDataModel/RigStatistics.cpp
similarity index 99%
rename from ApplicationCode/ReservoirDataModel/RigStatistics.cpp
rename to ApplicationCode/ProjectDataModel/RigStatistics.cpp
index cb593a8050..fb5cb26129 100644
--- a/ApplicationCode/ReservoirDataModel/RigStatistics.cpp
+++ b/ApplicationCode/ProjectDataModel/RigStatistics.cpp
@@ -15,6 +15,7 @@
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
+#include "RIStdInclude.h"
 
 #include "RigStatistics.h"
 #include "RigReservoirCellResults.h"
diff --git a/ApplicationCode/ReservoirDataModel/RigStatistics.h b/ApplicationCode/ProjectDataModel/RigStatistics.h
similarity index 100%
rename from ApplicationCode/ReservoirDataModel/RigStatistics.h
rename to ApplicationCode/ProjectDataModel/RigStatistics.h
diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
index 84b7d966db..5239d1e831 100644
--- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
@@ -16,7 +16,6 @@ ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.h
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
 ${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.h
-${CEE_CURRENT_LIST_DIR}RigStatistics.h
 ${CEE_CURRENT_LIST_DIR}RigWellResults.h
 )
 
@@ -31,7 +30,6 @@ ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp
 ${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.cpp
-${CEE_CURRENT_LIST_DIR}RigStatistics.cpp
 ${CEE_CURRENT_LIST_DIR}RigWellResults.cpp
 )