Move Rig well related things to subfolder and update include statements

2025-02-25 18:55:39 -06:00 · 2024-10-30 17:23:08 +01:00
parent 151128d829
commit da683bed9e
239 changed files with 555 additions and 526 deletions
--- a/ApplicationLibCode/Application/Tools/RiaExtractionTools.cpp
+++ b/ApplicationLibCode/Application/Tools/RiaExtractionTools.cpp
@@ -20,7 +20,7 @@

 #include "RiaSimWellBranchTools.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseCase.h"
 #include "RimMainPlotCollection.h"
--- a/ApplicationLibCode/Application/Tools/RiaWellLogUnitTools.inl
+++ b/ApplicationLibCode/Application/Tools/RiaWellLogUnitTools.inl
@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 #include "RiaEclipseUnitTools.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "cafAssert.h"

--- a/ApplicationLibCode/CMakeLists.txt
+++ b/ApplicationLibCode/CMakeLists.txt
@@ -95,6 +95,7 @@ list(
  ReservoirDataModel/Completions/CMakeLists_files.cmake
  ReservoirDataModel/ResultAccessors/CMakeLists_files.cmake
  ReservoirDataModel/ResultCalculators/CMakeLists_files.cmake
+  ReservoirDataModel/Well/CMakeLists_files.cmake
  FileInterface/CMakeLists_files.cmake
  ProjectDataModel/CMakeLists_files.cmake
  ProjectDataModel/AnalysisPlots/CMakeLists_files.cmake
--- a/ApplicationLibCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp
+++ b/ApplicationLibCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp
@@ -23,7 +23,7 @@
 #include "ExportCommands/RicExportSelectedWellPathsFeature.h"
 #include "ExportCommands/RicExportWellPathsUi.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimFishbones.h"
 #include "RimFishbonesCollection.h"
--- a/ApplicationLibCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp
+++ b/ApplicationLibCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp
@@ -23,7 +23,7 @@
 #include "RiaApplication.h"
 #include "RiaLogging.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "Rim3dView.h"
 #include "RimFishbones.h"
--- a/ApplicationLibCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp
+++ b/ApplicationLibCode/Commands/CompletionCommands/RicNewStimPlanModelPlotFeature.cpp
@@ -27,7 +27,7 @@
 #include "RimPlotCurveAppearance.h"
 #include "WellLogCommands/RicNewWellLogPlotFeatureImpl.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimColorLegend.h"
 #include "RimColorLegendCollection.h"
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp
@@ -39,7 +39,7 @@

 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "Riu3DMainWindowTools.h"

--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
@@ -57,12 +57,12 @@
 #include "RigFractureTransmissibilityEquations.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCoordsAndMD.h"
 #include "RigTransmissibilityCondenser.h"
 #include "RigTransmissibilityEquations.h"
-#include "RigWellPath.h"
 #include "RigWellPathStimplanIntersector.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+#include "Well/RigWellPath.h"

 #include "cvfGeometryTools.h"
 #include "cvfPlane.h"
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
@@ -30,9 +30,9 @@
 #include "RigCompletionData.h"
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimFishbones.h"
 #include "RimFishbonesCollection.h"
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswExportInfo.cpp
@@ -24,7 +24,7 @@
 #include "RimMswCompletionParameters.h"
 #include "RimWellPath.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include <algorithm>
 #include <limits>
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicMswTableFormatterTools.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicMswTableFormatterTools.cpp
@@ -25,7 +25,7 @@

 #include "RifTextDataTableFormatter.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimMswCompletionParameters.h"
 #include "RimWellPath.h" // TODO: Consider adding wellnameforexport to RicMswExportInfo to avoid these includes
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
@@ -47,10 +47,10 @@
 #include "RigResultAccessorFactory.h"
 #include "RigTransmissibilityEquations.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellLogExtractionTools.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigWellLogExtractionTools.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimFileWellPath.h"
 #include "RimFishbones.h"
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
@@ -34,9 +34,9 @@
 #include "RigEclipseCaseData.h"
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimEclipseCase.h"
 #include "RimFishbones.h"
--- a/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesFeature.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesFeature.cpp
@@ -24,8 +24,8 @@
 #include "RicCreateDepthAdjustedLasFilesUi.h"
 #include "RicExportFeatureImpl.h"

-#include "RigEclipseWellLogExtractor.h"
-#include "RigGeoMechWellLogExtractor.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"

 #include "RimEclipseCase.h"
 #include "RimGeoMechCase.h"
--- a/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.cpp
@@ -26,9 +26,9 @@
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigEclipseWellLogExtractor.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigResultAccessorFactory.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"

 #include "RimEclipseCase.h"
 #include "RimGeoMechCase.h"
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportLgrFeature.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportLgrFeature.cpp
@@ -31,9 +31,9 @@
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimDialogData.h"
 #include "RimEclipseCase.h"
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
@@ -25,8 +25,8 @@

 #include "RifTextDataTableFormatter.h"

-#include "RigWellPath.h"
-#include "RigWellPathGeometryExporter.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryExporter.h"

 #include "RimDialogData.h"
 #include "RimModeledWellPath.h"
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
@@ -26,7 +26,7 @@
 #include "RiaApplication.h"

 #include "RigLasFileExporter.h"
-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimWellLogCurve.h"
 #include "RimWellLogPlot.h"
--- a/ApplicationLibCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
+++ b/ApplicationLibCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
@@ -23,7 +23,7 @@
 #include "CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.h"
 #include "RicExportSelectedWellPathsFeature.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimProject.h"
 #include "RimSummaryCaseMainCollection.h"
--- a/ApplicationLibCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
+++ b/ApplicationLibCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
@@ -25,7 +25,7 @@
 #include "RifEclipseSummaryAddress.h"
 #include "RifSummaryReaderInterface.h"

-#include "RigSimWellData.h"
+#include "Well/RigSimWellData.h"

 #include "Rim3dView.h"
 #include "RimEclipseResultCase.h"
--- a/ApplicationLibCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
+++ b/ApplicationLibCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
@@ -21,7 +21,7 @@
 #include "RicSelectOrCreateViewFeatureImpl.h"

 #include "RigFlowDiagResultAddress.h"
-#include "RigSimWellData.h"
+#include "Well/RigSimWellData.h"

 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilter.h"
--- a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp
+++ b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp
@@ -22,9 +22,9 @@

 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimEclipseCase.h"
 #include "RimFractureTemplate.h"
--- a/ApplicationLibCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp
+++ b/ApplicationLibCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp
@@ -23,7 +23,7 @@

 #include "RicFractureNameGenerator.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp
+++ b/ApplicationLibCode/Commands/OsduImportCommands/RicWellPathsImportOsduFeature.cpp
@@ -27,7 +27,7 @@
 #include "RiaPreferences.h"
 #include "RiaPreferencesOsdu.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimFileWellPath.h"
 #include "RimOilField.h"
--- a/ApplicationLibCode/Commands/RicWellLogTools.cpp
+++ b/ApplicationLibCode/Commands/RicWellLogTools.cpp
@@ -21,7 +21,7 @@
 #include "RiaGuiApplication.h"

 #include "RigEclipseCaseData.h"
-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "Rim3dView.h"
 #include "RimCase.h"
--- a/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
@@ -34,7 +34,7 @@
 #include "RimWellPathCollection.h"
 #include "RiuPlotMainWindowTools.h"

-#include "RigWellLogLasFile.h"
+#include "Well/RigWellLogLasFile.h"

 #include "RiuQwtPlotWidget.h"

--- a/ApplicationLibCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
@@ -24,7 +24,7 @@
 #include "RicNewWellLogPlotFeatureImpl.h"
 #include "RicWellLogPlotCurveFeatureImpl.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "Rim3dView.h"
 #include "RimEclipseResultCase.h"
--- a/ApplicationLibCode/Commands/WellLogCommands/RicNewRftWellLogPlotFeature.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewRftWellLogPlotFeature.cpp
@@ -24,7 +24,7 @@

 #include "RiaApplication.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimRftCase.h"
 #include "RimSummaryCase.h"
--- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp
@@ -29,7 +29,8 @@
 #include "RigFemPartResultsCollection.h"
 #include "RigFemResultAddress.h"
 #include "RigGeoMechCaseData.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"
+
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
 #include "RimProject.h"
--- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogExtractionCurveFeature.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogExtractionCurveFeature.cpp
@@ -25,7 +25,7 @@

 #include "RiaApplication.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "Rim3dView.h"
 #include "RimGridView.h"
--- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogRftCurveFeature.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogRftCurveFeature.cpp
@@ -26,7 +26,7 @@
 #include "RimWellLogRftCurve.h"
 #include "RimWellLogTrack.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RiuPlotMainWindow.h"

--- a/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
@@ -20,7 +20,7 @@

 #include "RicPointTangentManipulator.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "Rim2dIntersectionView.h"
 #include "Rim3dView.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLaterals.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLaterals.cpp
@@ -20,7 +20,7 @@

 #include "RicNewWellPathLateralAtDepthFeature.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimModeledWellPath.h"
 #include "RimProject.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicCreateMultipleWellPathLateralsUi.cpp
@@ -21,7 +21,7 @@
 #include "RifTextDataTableFormatter.h"

 #include "RigMainGrid.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimModeledWellPath.h"
 #include "RimTools.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
@@ -23,8 +23,8 @@
 #include "RigFemPartGrid.h"
 #include "RigHexIntersectionTools.h"
 #include "RigMainGrid.h"
-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryTools.h"

 #include "Rim3dView.h"
 #include "RimCase.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicDuplicateWellPathFeature.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicDuplicateWellPathFeature.cpp
@@ -20,7 +20,7 @@

 #include "RiaColorTables.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimModeledWellPath.h"
 #include "RimOilField.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicNewWellPathLateralAtDepthFeature.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicNewWellPathLateralAtDepthFeature.cpp
@@ -20,7 +20,8 @@

 #include "WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"
+
 #include "RimFishbones.h"
 #include "RimFishbonesCollection.h"
 #include "RimModeledWellPath.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicNewWellPathLateralFeature.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicNewWellPathLateralFeature.cpp
@@ -20,7 +20,8 @@

 #include "RicNewWellPathLateralAtDepthFeature.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"
+
 #include "RimWellPath.h"

 #include "cafSelectionManager.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
@@ -20,7 +20,7 @@

 #include "RiaOffshoreSphericalCoords.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "Rim3dView.h"
 #include "RimModeledWellPath.h"
--- a/ApplicationLibCode/Commands/WellPathCommands/RicSetParentWellPathFeature.cpp
+++ b/ApplicationLibCode/Commands/WellPathCommands/RicSetParentWellPathFeature.cpp
@@ -18,7 +18,7 @@

 #include "RicSetParentWellPathFeature.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimTools.h"
 #include "RimWellPath.h"
--- a/ApplicationLibCode/FileInterface/RifOsduWellLogReader.h
+++ b/ApplicationLibCode/FileInterface/RifOsduWellLogReader.h
@@ -18,7 +18,7 @@

 #pragma once

-#include "RigOsduWellLogData.h"
+#include "Well/RigOsduWellLogData.h"

 #include "cvfObject.h"

--- a/ApplicationLibCode/FileInterface/RifOsduWellPathReader.cpp
+++ b/ApplicationLibCode/FileInterface/RifOsduWellPathReader.cpp
@@ -35,7 +35,7 @@
 #include "RifByteArrayArrowRandomAccessFile.h"
 #include "RifCsvUserDataParser.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "cvfObject.h"
 #include "cvfVector3.h"
--- a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
+++ b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
@@ -44,9 +44,9 @@
 #include "RigEquil.h"
 #include "RigMainGrid.h"
 #include "RigNNCData.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"
+#include "Well/RigWellResultPoint.h"

 #include "cafProgressInfo.h"

--- a/ApplicationLibCode/FileInterface/RifReaderEclipseWell.cpp
+++ b/ApplicationLibCode/FileInterface/RifReaderEclipseWell.cpp
@@ -26,9 +26,9 @@
 #include "RigEclipseResultInfo.h"
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"
+#include "Well/RigWellResultPoint.h"

 #include "cafProgressInfo.h"

--- a/ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp
+++ b/ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp
@@ -20,9 +20,9 @@

 #include "RiaExtractionTools.h"

-#include "RigEclipseWellLogExtractor.h"
 #include "RigStatisticsMath.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimSummaryCase.h"
 #include "RimSummaryEnsemble.h"
--- a/ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
+++ b/ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
@@ -36,8 +36,8 @@
 #include "RigEclipseResultInfo.h"
 #include "RigMainGrid.h"
 #include "RigNNCData.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"

 #include "cafProgressInfo.h"

--- a/ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp
+++ b/ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp
@@ -19,10 +19,10 @@
 #include "RifReaderRftInterface.h"

 #include "RigEclipseCaseData.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigMainGrid.h"
-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryTools.h"

 #include "cafVecIjk.h"

--- a/ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp
+++ b/ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp
@@ -23,7 +23,7 @@
 #include "RimStimPlanModel.h"
 #include "RimWellPath.h"

-#include "RigWellPathGeometryExporter.h"
+#include "Well/RigWellPathGeometryExporter.h"

 #include <QFile>
 #include <QTextStream>
--- a/ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp
+++ b/ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp
@@ -24,8 +24,8 @@
 #include "RimStimPlanModel.h"
 #include "RimWellPath.h"

-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryTools.h"

 #include "caf.h"

--- a/ApplicationLibCode/FileInterface/RifWellPathFormationReader.h
+++ b/ApplicationLibCode/FileInterface/RifWellPathFormationReader.h
@@ -18,7 +18,7 @@

 #pragma once

-#include "RigWellPathFormations.h"
+#include "Well/RigWellPathFormations.h"

 #include <map>
 #include <utility>
--- a/ApplicationLibCode/FileInterface/RifWellPathFormationsImporter.h
+++ b/ApplicationLibCode/FileInterface/RifWellPathFormationsImporter.h
@@ -18,7 +18,7 @@

 #pragma once

-#include "RigWellPathFormations.h"
+#include "Well/RigWellPathFormations.h"

 #include "cvfObject.h"

--- a/ApplicationLibCode/FileInterface/RifWellPathImporter.h
+++ b/ApplicationLibCode/FileInterface/RifWellPathImporter.h
@@ -20,7 +20,7 @@

 #pragma once

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "cvfObject.h"

--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorMudWeightWindow.cpp
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorMudWeightWindow.cpp
@@ -26,7 +26,7 @@
 #include "RigFemResultAddress.h"
 #include "RigFemScalarResultFrames.h"
 #include "RigGeoMechBoreHoleStressCalculator.h"
-#include "RigGeoMechWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"

 #include "RiaOffshoreSphericalCoords.h"

--- a/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSlipIndicator.cpp
+++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorShearSlipIndicator.cpp
@@ -25,7 +25,7 @@
 #include "RigFemPartResultsCollection.h"
 #include "RigFemResultAddress.h"
 #include "RigFemScalarResultFrames.h"
-#include "RigGeoMechWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"

 #include "cafProgressInfo.h"

--- a/ApplicationLibCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp
+++ b/ApplicationLibCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp
@@ -19,8 +19,8 @@
 #include "Riv3dWellLogCurveGeometryGenerator.h"

 #include "RiaCurveDataTools.h"
-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryTools.h"

 #include "Rim3dWellLogCurve.h"
 #include "RimWellPath.h"
--- a/ApplicationLibCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.cpp
+++ b/ApplicationLibCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.cpp
@@ -21,8 +21,8 @@
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"

-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathGeometryTools.h"

 #include "cafDisplayCoordTransform.h"

--- a/ApplicationLibCode/ModelVisualization/RivCompletionTypeResultToTextureMapper.h
+++ b/ApplicationLibCode/ModelVisualization/RivCompletionTypeResultToTextureMapper.h
@@ -21,7 +21,7 @@

 #include "RivResultToTextureMapper.h"

-#include "RigPipeInCellEvaluator.h"
+#include "Well/RigPipeInCellEvaluator.h"

 #include "cvfScalarMapper.h"
 #include "cvfVector2.h"
--- a/ApplicationLibCode/ModelVisualization/RivDefaultResultToTextureMapper.h
+++ b/ApplicationLibCode/ModelVisualization/RivDefaultResultToTextureMapper.h
@@ -19,7 +19,8 @@

 #pragma once

-#include "RigPipeInCellEvaluator.h"
+#include "Well/RigPipeInCellEvaluator.h"
+
 #include "RivResultToTextureMapper.h"

 #include "cvfScalarMapper.h"
--- a/ApplicationLibCode/ModelVisualization/RivFishbonesSubsPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivFishbonesSubsPartMgr.cpp
@@ -18,7 +18,7 @@

 #include "RivFishbonesSubsPartMgr.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimFishbones.h"
 #include "RimWellPath.h"
--- a/ApplicationLibCode/ModelVisualization/RivResultToTextureMapper.h
+++ b/ApplicationLibCode/ModelVisualization/RivResultToTextureMapper.h
@@ -19,7 +19,7 @@

 #pragma once

-#include "RigPipeInCellEvaluator.h"
+#include "Well/RigPipeInCellEvaluator.h"

 #include "cvfScalarMapper.h"
 #include "cvfVector2.h"
--- a/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
@@ -24,13 +24,13 @@
 #include "RiaExtractionTools.h"
 #include "RiaPreferences.h"

-#include "RigEclipseWellLogExtractor.h"
-#include "RigMswCenterLineCalculator.h"
-#include "RigSimulationWellCenterLineCalculator.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigMswCenterLineCalculator.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellResultFrame.h"

 #include "Rim3dView.h"
 #include "RimCase.h"
--- a/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.h
+++ b/ApplicationLibCode/ModelVisualization/RivSimWellPipesPartMgr.h
@@ -18,7 +18,7 @@

 #pragma once

-#include "RigSimWellData.h"
+#include "Well/RigSimWellData.h"

 #include "cafPdmPointer.h"

--- a/ApplicationLibCode/ModelVisualization/RivTernaryResultToTextureMapper.h
+++ b/ApplicationLibCode/ModelVisualization/RivTernaryResultToTextureMapper.h
@@ -19,7 +19,7 @@

 #pragma once

-#include "RigPipeInCellEvaluator.h"
+#include "Well/RigPipeInCellEvaluator.h"

 #include "RivTernaryScalarMapper.h"

--- a/ApplicationLibCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
@@ -24,9 +24,9 @@
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigPipeInCellEvaluator.h"
 #include "RigResultAccessorFactory.h"
 #include "RigTernaryResultAccessor.h"
+#include "Well/RigPipeInCellEvaluator.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseResultDefinition.h"
--- a/ApplicationLibCode/ModelVisualization/RivTextureCoordsCreator.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivTextureCoordsCreator.cpp
@@ -21,8 +21,8 @@

 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
-#include "RigPipeInCellEvaluator.h"
 #include "RigResultAccessorFactory.h"
+#include "Well/RigPipeInCellEvaluator.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellConnectionFactorPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellConnectionFactorPartMgr.cpp
@@ -20,11 +20,11 @@

 #include "RiaExtractionTools.h"

-#include "RigEclipseWellLogExtractor.h"
 #include "RigMainGrid.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellLogExtractor.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellConnectionsPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellConnectionsPartMgr.cpp
@@ -27,8 +27,8 @@
 #include "RigEclipseCaseData.h"
 #include "RigFlowDiagResults.h"
 #include "RigMainGrid.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"

 #include "cafDisplayCoordTransform.h"
 #include "cafEffectGenerator.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellDiskPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellDiskPartMgr.cpp
@@ -23,8 +23,8 @@

 #include "RigActiveCellInfo.h"
 #include "RigCell.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellFracturePartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellFracturePartMgr.cpp
@@ -24,7 +24,7 @@
 #include "RigFractureGrid.h"
 #include "RigHexIntersectionTools.h"
 #include "RigMainGrid.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimCase.h"
 #include "RimEclipseCase.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellHeadPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellHeadPartMgr.cpp
@@ -26,8 +26,8 @@
 #include "RigCell.h"
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.cpp
@@ -25,7 +25,7 @@
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "Rim3dWellLogCurveCollection.h"
 #include "RimEclipseCase.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellPathSourceInfo.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellPathSourceInfo.cpp
@@ -19,7 +19,7 @@

 #include "RivWellPathSourceInfo.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "Rim3dView.h"
 #include "RimCase.h"
--- a/ApplicationLibCode/ModelVisualization/RivWellSpheresPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/RivWellSpheresPartMgr.cpp
@@ -21,9 +21,9 @@
 #include "RiaGuiApplication.h"

 #include "RigMainGrid.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"
+#include "Well/RigWellResultPoint.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationLibCode/ModelVisualization/Streamlines/RivStreamlinesPartMgr.cpp
+++ b/ApplicationLibCode/ModelVisualization/Streamlines/RivStreamlinesPartMgr.cpp
@@ -31,10 +31,10 @@
 #include "RigCell.h"
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
-#include "RigSimulationWellCenterLineCalculator.h"
 #include "RigTracer.h"
 #include "RigTracerPoint.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigWellResultPoint.h"

 #include "RiuViewer.h"

--- a/ApplicationLibCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
@@ -23,8 +23,8 @@

 #include "RigCompletionData.h"
 #include "RigVirtualPerforationTransmissibilities.h"
-#include "RigWellPath.h"
-#include "RigWellPathIntersectionTools.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellPathIntersectionTools.h"

 #include "RimEclipseCase.h"
 #include "RimOilField.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbones.cpp
@@ -21,8 +21,9 @@
 #include "RiaColorTables.h"
 #include "RiaEclipseUnitTools.h"

-#include "RigFishbonesGeometry.h"
-#include "RigWellPath.h"
+#include "Well/RigFishbonesGeometry.h"
+#include "Well/RigWellPath.h"
+
 #include "RimFishbonesCollection.h"
 #include "RimFishbonesPipeProperties.h"
 #include "RimMultipleValveLocations.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
@@ -22,7 +22,7 @@

 #include "RifWellPathImporter.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimFishbones.h"
 #include "RimProject.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimMeshFractureTemplate.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMeshFractureTemplate.cpp
@@ -28,8 +28,8 @@
 #include "RigFractureCell.h"
 #include "RigFractureGrid.h"
 #include "RigTransmissibilityEquations.h"
-#include "RigWellPath.h"
 #include "RigWellPathStimplanIntersector.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseView.h"
 #include "RimFracture.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimMultipleValveLocations.cpp
@@ -18,7 +18,7 @@

 #include "RimMultipleValveLocations.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RiaEclipseUnitTools.h"

--- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
@@ -27,7 +27,7 @@
 #include "RimPerforationInterval.h"
 #include "RimProject.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RifWellPathImporter.h"

--- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
@@ -24,7 +24,7 @@
 #include "RiaQDateTimeTools.h"

 #include "RigCaseCellResultsData.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimPerforationCollection.h"
 #include "RimProject.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
@@ -20,10 +20,10 @@

 #include "RigCell.h"
 #include "RigMainGrid.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigWellPath.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigWellPath.h"
+#include "Well/RigWellResultPoint.h"

 #include "RimEclipseView.h"
 #include "RimEllipseFractureTemplate.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.h
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFracture.h
@@ -20,7 +20,8 @@

 #include "RimFracture.h"

-#include "RigSimulationWellCoordsAndMD.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+
 #include "RimEllipseFractureTemplate.h"

 //==================================================================================================
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp
@@ -31,7 +31,7 @@
 #include "RigFractureGrid.h"
 #include "RigThermalFractureDefinition.h"
 #include "RigThermalFractureResultUtil.h"
-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseView.h"
 #include "RimFracture.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
@@ -19,7 +19,7 @@

 #include "RimWellPathFracture.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimEllipseFractureTemplate.h"
 #include "RimProject.h"
--- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathValve.cpp
@@ -24,7 +24,7 @@

 #include "Riu3DMainWindowTools.h"

-#include "RigWellPath.h"
+#include "Well/RigWellPath.h"

 #include "RimMultipleValveLocations.h"
 #include "RimPerforationInterval.h"
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorPorePressure.cpp
@@ -29,11 +29,11 @@
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigFaultReactivationModel.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include <cmath>
 #include <limits>
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStress.cpp
@@ -28,9 +28,9 @@
 #include "RigFemResultAddress.h"
 #include "RigFemScalarResultFrames.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigGriddedPart3d.h"
-#include "RigWellPath.h"
+#include "Well/RigGeoMechWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimFaultReactivationDataAccessorWellLogExtraction.h"
 #include "RimFaultReactivationEnums.h"
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStressEclipse.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStressEclipse.cpp
@@ -25,12 +25,12 @@

 #include "RigCaseCellResultsData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigFaultReactivationModel.h"
 #include "RigGriddedPart3d.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseCase.h"
 #include "RimFaultReactivationDataAccessorStress.h"
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStressGeoMech.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorStressGeoMech.cpp
@@ -28,10 +28,10 @@
 #include "RigFemResultAddress.h"
 #include "RigFemScalarResultFrames.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigGriddedPart3d.h"
 #include "RigResultAccessorFactory.h"
-#include "RigWellPath.h"
+#include "Well/RigGeoMechWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimFaultReactivationDataAccessorStress.h"
 #include "RimFaultReactivationDataAccessorWellLogExtraction.h"
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorTemperature.cpp
@@ -26,10 +26,10 @@
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseResultAddress.h"
-#include "RigEclipseWellLogExtractor.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimEclipseCase.h"
 #include "RimFaultReactivationDataAccessorWellLogExtraction.h"
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorWellLogExtraction.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultReactivationDataAccessorWellLogExtraction.cpp
@@ -22,7 +22,6 @@
 #include "RiaInterpolationTools.h"
 #include "RiaLogging.h"

-#include "RigEclipseWellLogExtractor.h"
 #include "RigFaultReactivationModel.h"
 #include "RigFemAddressDefines.h"
 #include "RigFemPartCollection.h"
@@ -30,10 +29,11 @@
 #include "RigFemResultAddress.h"
 #include "RigFemScalarResultFrames.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGeoMechWellLogExtractor.h"
 #include "RigGriddedPart3d.h"
 #include "RigResultAccessorFactory.h"
-#include "RigWellPath.h"
+#include "Well/RigEclipseWellLogExtractor.h"
+#include "Well/RigGeoMechWellLogExtractor.h"
+#include "Well/RigWellPath.h"

 #include "RimFaultReactivationEnums.h"
 #include "RimFracture.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
@@ -23,9 +23,9 @@
 #include "RigEclipseCaseData.h"
 #include "RigFlowDiagResults.h"
 #include "RigMainGrid.h"
-#include "RigSimWellData.h"
-#include "RigWellResultFrame.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigWellResultFrame.h"
+#include "Well/RigWellResultPoint.h"

 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
@@ -24,8 +24,8 @@
 #include "RimSimWellInViewCollection.h"
 #include "RimWellAllocationPlot.h"

-#include "RigSimWellData.h"
 #include "RigTofAccumulatedPhaseFractionsCalculator.h"
+#include "Well/RigSimWellData.h"

 #include "RimProject.h"
 #include "RimWellLogPlot.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
@@ -23,7 +23,7 @@
 #include "RimEclipseView.h"
 #include "RimSimWellInViewCollection.h"

-#include "RigSimWellData.h"
+#include "Well/RigSimWellData.h"

 #include "RimProject.h"
 #include "RimWellLogPlot.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.cpp
@@ -25,12 +25,12 @@
 #include "RiaQDateTimeTools.h"
 #include "RiaStdStringTools.h"

-#include "RigAccWellFlowCalculator.h"
 #include "RigEclipseCaseData.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigWellAllocationOverTime.h"
-#include "RigWellResultPoint.h"
+#include "Well/RigAccWellFlowCalculator.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigWellAllocationOverTime.h"
+#include "Well/RigWellResultPoint.h"

 #include "RimEclipseCaseTools.h"
 #include "RimEclipseCellColors.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
@@ -24,15 +24,15 @@
 #include "RiaPlotDefines.h"
 #include "RiaPreferences.h"

-#include "RigAccWellFlowCalculator.h"
 #include "RigEclipseCaseData.h"
 #include "RigEclipseCaseDataTools.h"
 #include "RigFlowDiagResultAddress.h"
 #include "RigFlowDiagResults.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigSimulationWellCoordsAndMD.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigAccWellFlowCalculator.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigSimulationWellCoordsAndMD.h"
+#include "Well/RigWellResultFrame.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseCaseTools.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationTools.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationTools.cpp
@@ -21,7 +21,7 @@
 #include "RiaDefines.h"

 #include "RigFlowDiagResults.h"
-#include "RigSimWellData.h"
+#include "Well/RigSimWellData.h"

 #include "RimFlowDiagSolution.h"

--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellConnectivityTable.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellConnectivityTable.cpp
@@ -23,12 +23,12 @@
 #include "RiaStdStringTools.h"
 #include "RiaWellFlowDefines.h"

-#include "RigAccWellFlowCalculator.h"
 #include "RigEclipseCaseData.h"
-#include "RigSimWellData.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-#include "RigWellAllocationOverTime.h"
-#include "RigWellResultFrame.h"
+#include "Well/RigAccWellFlowCalculator.h"
+#include "Well/RigSimWellData.h"
+#include "Well/RigSimulationWellCenterLineCalculator.h"
+#include "Well/RigWellAllocationOverTime.h"
+#include "Well/RigWellResultFrame.h"

 #include "RimEclipseCaseTools.h"
 #include "RimEclipseCellColors.h"
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
@@ -20,7 +20,7 @@

 #include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"

-#include "RigWellLogCurveData.h"
+#include "Well/RigWellLogCurveData.h"

 #include "RimWellAllocationPlot.h"
 #include "RimWellLogPlot.h"
--- a/Show More
+++ b/Show More