diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index e9f95ef214..85f9d8e97a 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -161,38 +161,8 @@ list( APPEND REFERENCED_CMAKE_FILES
     UserInterface/CMakeLists_files.cmake
     UserInterface/AnalysisPlots/CMakeLists_files.cmake
     
-    Commands/CMakeLists_files.cmake
-	Commands/AnalysisPlotCommands/CMakeLists_files.cmake
-    Commands/ApplicationCommands/CMakeLists_files.cmake
-    Commands/AnnotationCommands/CMakeLists_files.cmake
-	Commands/ColorLegendCommands/CMakeLists_files.cmake
-    Commands/CompletionCommands/CMakeLists_files.cmake
-    Commands/CompletionExportCommands/CMakeLists_files.cmake
-	Commands/CorrelationPlotCommands/CMakeLists_files.cmake
-    Commands/CrossSectionCommands/CMakeLists_files.cmake
-    Commands/EclipseCommands/CMakeLists_files.cmake
-    Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake
-    Commands/ExportCommands/CMakeLists_files.cmake
-    Commands/FlowCommands/CMakeLists_files.cmake
-    Commands/GridCrossPlotCommands/CMakeLists_files.cmake
-    Commands/HoloLensCommands/CMakeLists_files.cmake
-    Commands/IntersectionBoxCommands/CMakeLists_files.cmake
-    Commands/IntersectionViewCommands/CMakeLists_files.cmake
-    Commands/MeasurementCommands/CMakeLists_files.cmake
-    Commands/OctaveScriptCommands/CMakeLists_files.cmake
-    Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
-    Commands/SummaryPlotCommands/CMakeLists_files.cmake
-    Commands/SsiHubImportCommands/CMakeLists_files.cmake
-    Commands/SurfaceCommands/CMakeLists_files.cmake
-    Commands/ToggleCommands/CMakeLists_files.cmake
-    Commands/ViewLink/CMakeLists_files.cmake
-    Commands/WellLogCommands/CMakeLists_files.cmake
-    Commands/WellPathCommands/CMakeLists_files.cmake
-    Commands/PlotTemplateCommands/CMakeLists_files.cmake
-
     CommandFileInterface/CMakeLists_files.cmake
     CommandFileInterface/Core/CMakeLists_files.cmake
-    Commands/FractureCommands/CMakeLists_files.cmake
 )
 
 option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF)
@@ -225,8 +195,10 @@ list( APPEND CPP_SOURCES
 #############################################################################
 
 add_subdirectory(ResultStatisticsCache)
+add_subdirectory(Commands)
 
 set( RI_LIBRARIES
+    Commands
     ResultStatisticsCache
 )
 
diff --git a/ApplicationCode/Commands/AnalysisPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/AnalysisPlotCommands/CMakeLists_files.cmake
index 0baa05700f..63187ab401 100644
--- a/ApplicationCode/Commands/AnalysisPlotCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/AnalysisPlotCommands/CMakeLists_files.cmake
@@ -9,11 +9,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewAnalysisPlotFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotDataFilterFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/AnnotationCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/AnnotationCommands/CMakeLists_files.cmake
index 5ca865c52f..b41f769daa 100644
--- a/ApplicationCode/Commands/AnnotationCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/AnnotationCommands/CMakeLists_files.cmake
@@ -17,16 +17,16 @@ ${CMAKE_CURRENT_LIST_DIR}/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-set (QT_MOC_HEADERS
-${QT_MOC_HEADERS}
+set (COMMAND_QT_MOC_HEADERS
+${COMMAND_QT_MOC_HEADERS}
 ${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h
 )
 
diff --git a/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake
index ba1a492c8b..9773c8b899 100644
--- a/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake
@@ -45,16 +45,16 @@ ${CMAKE_CURRENT_LIST_DIR}/RicExportObjectAndFieldKeywordsFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectNoGlobalPathsFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-set (QT_MOC_HEADERS
-${QT_MOC_HEADERS}
+set (COMMAND_QT_MOC_HEADERS
+${COMMAND_QT_MOC_HEADERS}
 )
 
 
diff --git a/ApplicationCode/Commands/CMakeLists.txt b/ApplicationCode/Commands/CMakeLists.txt
new file mode 100644
index 0000000000..9d9e9a6c13
--- /dev/null
+++ b/ApplicationCode/Commands/CMakeLists.txt
@@ -0,0 +1,84 @@
+cmake_minimum_required (VERSION 2.8.12)
+
+project (Commands)
+
+# Unity Build
+if (RESINSIGHT_ENABLE_UNITY_BUILD)
+  message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
+  set(CMAKE_UNITY_BUILD true)
+endif()
+
+set( COMMAND_REFERENCED_CMAKE_FILES
+    CMakeLists_files.cmake
+    AnalysisPlotCommands/CMakeLists_files.cmake
+    ApplicationCommands/CMakeLists_files.cmake
+    AnnotationCommands/CMakeLists_files.cmake
+    ColorLegendCommands/CMakeLists_files.cmake
+    CompletionCommands/CMakeLists_files.cmake
+    CompletionExportCommands/CMakeLists_files.cmake
+    CorrelationPlotCommands/CMakeLists_files.cmake
+    CrossSectionCommands/CMakeLists_files.cmake
+    EclipseCommands/CMakeLists_files.cmake
+    EclipseCommands/EclipseWell/CMakeLists_files.cmake
+    ExportCommands/CMakeLists_files.cmake
+    FlowCommands/CMakeLists_files.cmake
+    GridCrossPlotCommands/CMakeLists_files.cmake
+    HoloLensCommands/CMakeLists_files.cmake
+    IntersectionBoxCommands/CMakeLists_files.cmake
+    IntersectionViewCommands/CMakeLists_files.cmake
+    MeasurementCommands/CMakeLists_files.cmake
+    OctaveScriptCommands/CMakeLists_files.cmake
+    OperationsUsingObjReferences/CMakeLists_files.cmake
+    SummaryPlotCommands/CMakeLists_files.cmake
+    SsiHubImportCommands/CMakeLists_files.cmake
+    SurfaceCommands/CMakeLists_files.cmake
+    ToggleCommands/CMakeLists_files.cmake
+    ViewLink/CMakeLists_files.cmake
+    WellLogCommands/CMakeLists_files.cmake
+    WellPathCommands/CMakeLists_files.cmake
+    PlotTemplateCommands/CMakeLists_files.cmake
+    FractureCommands/CMakeLists_files.cmake
+)
+
+# Include source file lists from *.cmake files
+foreach (referencedfile ${COMMAND_REFERENCED_CMAKE_FILES})
+    include (${referencedfile})
+endforeach (referencedfile)
+
+
+# Prefix files with COMMAND_ to avoid clash with application global lists
+qt5_wrap_cpp(COMMAND_MOC_SOURCE_FILES ${COMMAND_QT_MOC_HEADERS} )
+
+add_library( ${PROJECT_NAME} OBJECT
+    ${COMMAND_CODE_SOURCE_FILES}
+    ${COMMAND_CODE_HEADER_FILES}
+    ${COMMAND_MOC_SOURCE_FILES}
+    CMakeLists_files.cmake
+)
+
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set( LINK_LIBRARIES
+  LibCore 
+
+  cafCommand
+  cafPdmCvf
+  cafTensor
+  cafViewer
+  cafVizExtensions
+
+  ecl
+  nightcharts
+  qwt
+
+  ${QT_LIBRARIES}
+)
+
+target_link_libraries( ${PROJECT_NAME}
+  ${LINK_LIBRARIES}
+)
+
+source_group("" FILES ${PROJECT_FILES})
diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake
index 5ede27a556..77bda36c6a 100644
--- a/ApplicationCode/Commands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CMakeLists_files.cmake
@@ -14,7 +14,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewInViewFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewExec.h
 ${CMAKE_CURRENT_LIST_DIR}/RicNewViewFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicNewContourMapViewFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicPropertyFilterNewExec.h
 ${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterExecImpl.h
 ${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertExec.h
 ${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertFeature.h
@@ -34,8 +33,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RicHideIntersectionBoxFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicImportElementPropertyFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicSelectColorResult.h
 
-${CMAKE_CURRENT_LIST_DIR}/RicWellLogsImportFileFeature.h
-
 ${CMAKE_CURRENT_LIST_DIR}/RicTogglePerspectiveViewFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicImportGeoMechCaseFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicImportGeoMechCaseTimeStepFilterFeature.h
@@ -69,12 +66,9 @@ ${CMAKE_CURRENT_LIST_DIR}/RicElasticPropertiesImportTools.h
 
 ${CMAKE_CURRENT_LIST_DIR}/RicCloseSourSimDataFeature.h
 
-${CMAKE_CURRENT_LIST_DIR}/RicCommandFeature.h
-
 ${CMAKE_CURRENT_LIST_DIR}/RicReloadCaseFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicReplaceCaseFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicReloadSummaryCaseFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicReloadSummaryCasesFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicReplaceSummaryCaseFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicFlyToObjectFeature.h
 
@@ -191,15 +185,15 @@ ${CMAKE_CURRENT_LIST_DIR}/RicUnstackSelectedCurvesFeature.cpp
 )
 
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 ${CMAKE_CURRENT_LIST_DIR}/RicGridStatisticsDialog.h
 ${CMAKE_CURRENT_LIST_DIR}/RicRecursiveFileSearchDialog.h
 ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCaseRestartDialog.h
diff --git a/ApplicationCode/Commands/ColorLegendCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ColorLegendCommands/CMakeLists_files.cmake
index 6e2686cdff..52591faa88 100644
--- a/ApplicationCode/Commands/ColorLegendCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/ColorLegendCommands/CMakeLists_files.cmake
@@ -14,11 +14,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicInsertColorLegendItemFeature.cpp
 )
 
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake
index 3f790a7376..f7d62d0b29 100644
--- a/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake
@@ -32,11 +32,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewFractureModelPlotFeature.cpp
 )
 
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake
index a481bb6bcc..71c5466978 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake
@@ -44,11 +44,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicWellPathFractureReportItem.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicExportCompletionsForTemporaryLgrsFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/CorrelationPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CorrelationPlotCommands/CMakeLists_files.cmake
index 49c7ee4935..b84ad775c0 100644
--- a/ApplicationCode/Commands/CorrelationPlotCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CorrelationPlotCommands/CMakeLists_files.cmake
@@ -13,11 +13,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewParameterResultCrossPlotFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewCorrelationReportPlotFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake
index 32c76bd967..58e57e7d67 100644
--- a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake
@@ -19,11 +19,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake
index 1bfbc3825f..64fd99ead7 100644
--- a/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake
@@ -43,11 +43,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake b/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake
index 333d21e9ac..f644800fb9 100644
--- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake
@@ -10,11 +10,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellFeatureImpl.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake
index 29c9c031ab..68519661f5 100644
--- a/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake
@@ -57,11 +57,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicExportLgrUi.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicEclipseCellResultToFileImpl.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake
index 69b955ab2c..89f050c8da 100644
--- a/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake
@@ -27,11 +27,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicShowTotalAllocationDataFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicShowCumulativePhasePlotFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake
index 5c9562dc06..3b8e3a8e81 100644
--- a/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake
@@ -43,15 +43,15 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewOptionItemFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicDeleteOptionItemFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateMultipleFracturesFeature.h
 )
 
diff --git a/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake
index a2333941be..528eca2504 100644
--- a/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake
@@ -17,11 +17,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/HoloLensCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/HoloLensCommands/CMakeLists_files.cmake
index 94db1a4de9..3c8c1d3336 100644
--- a/ApplicationCode/Commands/HoloLensCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/HoloLensCommands/CMakeLists_files.cmake
@@ -49,16 +49,16 @@ ${CMAKE_CURRENT_LIST_DIR}/VdeVizDataExtractor.cpp
 )
 
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-set (QT_MOC_HEADERS
-${QT_MOC_HEADERS}
+set (COMMAND_QT_MOC_HEADERS
+${COMMAND_QT_MOC_HEADERS}
 ${CMAKE_CURRENT_LIST_DIR}/RicHoloLensRestClient.h
 ${CMAKE_CURRENT_LIST_DIR}/RicExportToSharingServerScheduler.h
 )
diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake
index 8ecd003d12..56b6383bd2 100644
--- a/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake
@@ -19,16 +19,16 @@ ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxZSliceFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-set (QT_MOC_HEADERS
-${QT_MOC_HEADERS}
+set (COMMAND_QT_MOC_HEADERS
+${COMMAND_QT_MOC_HEADERS}
 ${CMAKE_CURRENT_LIST_DIR}/RicBoxManipulatorEventHandler.h
 )
 
diff --git a/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake
index 9dc9020940..389be0fefe 100644
--- a/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake
@@ -7,11 +7,11 @@ set (SOURCE_GROUP_SOURCE_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/MeasurementCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/MeasurementCommands/CMakeLists_files.cmake
index ce64437e6c..3d69470b24 100644
--- a/ApplicationCode/Commands/MeasurementCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/MeasurementCommands/CMakeLists_files.cmake
@@ -9,15 +9,15 @@ ${CMAKE_CURRENT_LIST_DIR}/RicToggleMeasurementModeFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicMeasurementPickEventHandler.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 )
 
 source_group( "CommandFeature\\Measurement" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )
diff --git a/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake
index 1c110b0e32..eeb84469c1 100644
--- a/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake
@@ -23,16 +23,16 @@ ${CMAKE_CURRENT_LIST_DIR}/RicScriptFeatureImpl.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.cpp
 )
 
-set (QT_MOC_HEADERS
-${QT_MOC_HEADERS}
+set (COMMAND_QT_MOC_HEADERS
+${COMMAND_QT_MOC_HEADERS}
 ${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptForCasesFeature.h
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake b/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
index 9cd1e67568..35106e62b9 100644
--- a/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
@@ -21,11 +21,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteGeoMechViewsFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/PlotTemplateCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/PlotTemplateCommands/CMakeLists_files.cmake
index e8404ce31b..c0d8a635a9 100644
--- a/ApplicationCode/Commands/PlotTemplateCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/PlotTemplateCommands/CMakeLists_files.cmake
@@ -19,15 +19,15 @@ ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 )
 
 source_group( "CommandFeature\\PlotTemplate" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )
diff --git a/ApplicationCode/Commands/SsiHubImportCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SsiHubImportCommands/CMakeLists_files.cmake
index 952ed159b6..3de66c1113 100644
--- a/ApplicationCode/Commands/SsiHubImportCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/SsiHubImportCommands/CMakeLists_files.cmake
@@ -17,15 +17,15 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellsEntry.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 ${CMAKE_CURRENT_LIST_DIR}/RiuWellImportWizard.h
 )
 
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
index 8385fe4e07..0d368a7bca 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
@@ -91,15 +91,15 @@ ${CMAKE_CURRENT_LIST_DIR}/RicActivateCurveFilterInToolbarFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h
 ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h
 ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.h
diff --git a/ApplicationCode/Commands/SurfaceCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SurfaceCommands/CMakeLists_files.cmake
index e2b1e25f69..3377f29986 100644
--- a/ApplicationCode/Commands/SurfaceCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/SurfaceCommands/CMakeLists_files.cmake
@@ -19,16 +19,16 @@ ${CMAKE_CURRENT_LIST_DIR}/RicExportSurfaceToTsurfFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewSurfaceCollectionFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-#set (QT_MOC_HEADERS
-#${QT_MOC_HEADERS}
+#set (COMMAND_QT_MOC_HEADERS
+#${COMMAND_QT_MOC_HEADERS}
 #${CMAKE_CURRENT_LIST_DIR}/RicTextAnnotation3dEditor.h
 #)
 
diff --git a/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake
index 347670701c..fc778fa048 100644
--- a/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake
@@ -17,11 +17,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnOthersOffFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicCollapseSiblingsFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake b/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake
index 1fb797c393..c8c5d91265 100644
--- a/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake
@@ -25,11 +25,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicRemoveComparison3dViewFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicCompareTo3dViewFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake
index 0b60dbf8b9..55eac1ea3d 100644
--- a/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake
@@ -63,11 +63,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RicNewWellBoreStabilityPlotFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewWellMeasurementCurveFeature.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
diff --git a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
index 2ed251eb7d..51921ff6aa 100644
--- a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
@@ -55,15 +55,15 @@ ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolyline3dEditor.cpp
 ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolylineTarget3dEditor.cpp
 )
 
-list(APPEND CODE_HEADER_FILES
+list(APPEND COMMAND_CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
 
-list(APPEND CODE_SOURCE_FILES
+list(APPEND COMMAND_CODE_SOURCE_FILES
 ${SOURCE_GROUP_SOURCE_FILES}
 )
 
-list(APPEND QT_MOC_HEADERS
+list(APPEND COMMAND_QT_MOC_HEADERS
 ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPointTangentManipulator.h
 ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicWellTarget3dEditor.h
 ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicWellPathGeometry3dEditor.h