diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 799b69ca67..787c9d8772 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -118,6 +118,7 @@ list( APPEND REFERENCED_CMAKE_FILES
 	Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
     Commands/ToggleCommands/CMakeLists_files.cmake
     Commands/OctaveScriptCommands/CMakeLists_files.cmake
+    Commands/ViewLink/CMakeLists_files.cmake
 )
 
 # Include source file lists from *.cmake files
diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake
index bd64d3ac46..9b09b14b1e 100644
--- a/ApplicationCode/Commands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CMakeLists_files.cmake
@@ -54,10 +54,6 @@ ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.h
 
-${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.h
-${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.h
-${CEE_CURRENT_LIST_DIR}RicShowAllLinkedViewsFeature.h
-
 ${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h
 
 # General delete of any object in a child array field
@@ -115,10 +111,6 @@ ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.cpp
 
-${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.cpp
-${CEE_CURRENT_LIST_DIR}RicShowAllLinkedViewsFeature.cpp
-
 ${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.cpp
 
 # General delete of any object in a child array field
diff --git a/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake b/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake
new file mode 100644
index 0000000000..1af8824eb6
--- /dev/null
+++ b/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake
@@ -0,0 +1,27 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.h
+${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.h
+${CEE_CURRENT_LIST_DIR}RicShowAllLinkedViewsFeature.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.cpp
+${CEE_CURRENT_LIST_DIR}RicShowAllLinkedViewsFeature.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "CommandFeature\\ViewLink" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )
diff --git a/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
rename to ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
diff --git a/ApplicationCode/Commands/RicLinkVisibleViewsFeature.h b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicLinkVisibleViewsFeature.h
rename to ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.h
diff --git a/ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.cpp b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.cpp
rename to ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
diff --git a/ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.h b/ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.h
similarity index 100%
rename from ApplicationCode/Commands/RicLinkVisibleViewsFeatureUi.h
rename to ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.h
diff --git a/ApplicationCode/Commands/RicShowAllLinkedViewsFeature.cpp b/ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicShowAllLinkedViewsFeature.cpp
rename to ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.cpp
diff --git a/ApplicationCode/Commands/RicShowAllLinkedViewsFeature.h b/ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicShowAllLinkedViewsFeature.h
rename to ApplicationCode/Commands/ViewLink/RicShowAllLinkedViewsFeature.h