diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
index 82f93d33da..dc5495be37 100644
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -90,16 +90,6 @@ ${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.h
 ${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.h
 ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
-${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.h
-${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.h
-${CEE_CURRENT_LIST_DIR}RimFracture.h
-${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h
-${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.h
-${CEE_CURRENT_LIST_DIR}RimSimWellFracture.h
-${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.h
-${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.h
-${CEE_CURRENT_LIST_DIR}RimFractureTemplate.h
-${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.h
 ${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.h
 ${CEE_CURRENT_LIST_DIR}RimStimPlanColors.h
 )
@@ -190,16 +180,6 @@ ${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.cpp
 ${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp
 ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
-${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.cpp
-${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.cpp
-${CEE_CURRENT_LIST_DIR}RimFracture.cpp
-${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp
-${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.cpp
-${CEE_CURRENT_LIST_DIR}RimSimWellFracture.cpp
-${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.cpp
-${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.cpp
-${CEE_CURRENT_LIST_DIR}RimFractureTemplate.cpp
-${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.cpp
 ${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.cpp
 ${CEE_CURRENT_LIST_DIR}RimStimPlanColors.cpp
 )
diff --git a/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake
index fa73750ed0..ef4b9a6153 100644
--- a/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake
@@ -5,25 +5,45 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
 endif()
 
 set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.h
 ${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.h
 ${CEE_CURRENT_LIST_DIR}RimFishbonesMultipleSubs.h
 ${CEE_CURRENT_LIST_DIR}RimFishbonesPipeProperties.h
 ${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.h
 ${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.h
+${CEE_CURRENT_LIST_DIR}RimFracture.h
+${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.h
+${CEE_CURRENT_LIST_DIR}RimFractureTemplate.h
+${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.h
 ${CEE_CURRENT_LIST_DIR}RimPerforationCollection.h
 ${CEE_CURRENT_LIST_DIR}RimPerforationInterval.h
+${CEE_CURRENT_LIST_DIR}RimSimWellFracture.h
+${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.h
+${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.h
 ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h
+${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h
+${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishbonesMultipleSubs.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishbonesPipeProperties.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.cpp
 ${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.cpp
+${CEE_CURRENT_LIST_DIR}RimFracture.cpp
+${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.cpp
+${CEE_CURRENT_LIST_DIR}RimFractureTemplate.cpp
+${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimPerforationCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimPerforationInterval.cpp
+${CEE_CURRENT_LIST_DIR}RimSimWellFracture.cpp
+${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.cpp
+${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp
+${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp
+${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
diff --git a/ApplicationCode/ProjectDataModel/RimEllipseFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimEllipseFractureTemplate.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimEllipseFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimEllipseFractureTemplate.h
rename to ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
diff --git a/ApplicationCode/ProjectDataModel/RimFracture.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFracture.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimFracture.h b/ApplicationCode/ProjectDataModel/Completions/RimFracture.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFracture.h
rename to ApplicationCode/ProjectDataModel/Completions/RimFracture.h
diff --git a/ApplicationCode/ProjectDataModel/RimFractureExportSettings.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFractureExportSettings.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimFractureExportSettings.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimFractureExportSettings.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureExportSettings.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFractureExportSettings.h
rename to ApplicationCode/ProjectDataModel/Completions/RimFractureExportSettings.h
diff --git a/ApplicationCode/ProjectDataModel/RimFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFractureTemplate.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFractureTemplate.h
rename to ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
diff --git a/ApplicationCode/ProjectDataModel/RimFractureTemplateCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFractureTemplateCollection.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimFractureTemplateCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimFractureTemplateCollection.h
rename to ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFracture.h b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimSimWellFracture.h
rename to ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.h
diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimSimWellFractureCollection.h
rename to ApplicationCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h
diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.h
rename to ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFracture.h b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimWellPathFracture.h
rename to ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.h
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.cpp
rename to ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.h
similarity index 100%
rename from ApplicationCode/ProjectDataModel/RimWellPathFractureCollection.h
rename to ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.h