diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 9b2ceea7b4..43cc497c73 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -110,6 +110,7 @@ list( APPEND REFERENCED_CMAKE_FILES
 	Commands/CMakeLists_files.cmake
 	Commands/OperationsUsingObjReferences/CMakeLists_files.cmake
     Commands/ToggleCommands/CMakeLists_files.cmake
+    Commands/OctaveScriptCommands/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 a106bc171b..0d5eb82c16 100644
--- a/ApplicationCode/Commands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/CMakeLists_files.cmake
@@ -6,13 +6,6 @@ endif()
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RicCloseCaseFeature.h
-${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.h
-${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.h
-${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.h
-${CEE_CURRENT_LIST_DIR}RicAddScriptPathFeature.h
-${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.h
-${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.h
-${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.h
@@ -63,13 +56,6 @@ ${CEE_CURRENT_LIST_DIR}RicDeleteItemFeature.h
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RicCloseCaseFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.cpp
-${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicAddScriptPathFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.cpp
@@ -117,11 +103,6 @@ ${CEE_CURRENT_LIST_DIR}RicDeleteItemExecData.cpp
 ${CEE_CURRENT_LIST_DIR}RicDeleteItemFeature.cpp
 )
 
-set (QT_MOC_HEADERS
-${QT_MOC_HEADERS}
-${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h
-)
-
 list(APPEND CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}
 )
diff --git a/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake
new file mode 100644
index 0000000000..c2455a8446
--- /dev/null
+++ b/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake
@@ -0,0 +1,40 @@
+
+# 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}RicAddScriptPathFeature.h
+${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.h
+${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.h
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.h
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.h
+${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RicAddScriptPathFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.cpp
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ToggleCommands" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )
diff --git a/ApplicationCode/Commands/RicAddScriptPathFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicAddScriptPathFeature.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.cpp
diff --git a/ApplicationCode/Commands/RicAddScriptPathFeature.h b/ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicAddScriptPathFeature.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.h
diff --git a/ApplicationCode/Commands/RicDeleteScriptPathFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicDeleteScriptPathFeature.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp
diff --git a/ApplicationCode/Commands/RicDeleteScriptPathFeature.h b/ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicDeleteScriptPathFeature.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.h
diff --git a/ApplicationCode/Commands/RicEditScriptFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicEditScriptFeature.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.cpp
diff --git a/ApplicationCode/Commands/RicEditScriptFeature.h b/ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicEditScriptFeature.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.h
diff --git a/ApplicationCode/Commands/RicExecuteScriptFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicExecuteScriptFeature.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.cpp
diff --git a/ApplicationCode/Commands/RicExecuteScriptFeature.h b/ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicExecuteScriptFeature.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.h
diff --git a/ApplicationCode/Commands/RicExecuteScriptForCasesFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicExecuteScriptForCasesFeature.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp
diff --git a/ApplicationCode/Commands/RicExecuteScriptForCasesFeature.h b/ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicExecuteScriptForCasesFeature.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.h
diff --git a/ApplicationCode/Commands/RicNewScriptFeature.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicNewScriptFeature.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.cpp
diff --git a/ApplicationCode/Commands/RicNewScriptFeature.h b/ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.h
similarity index 100%
rename from ApplicationCode/Commands/RicNewScriptFeature.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.h
diff --git a/ApplicationCode/Commands/RicScriptFeatureImpl.cpp b/ApplicationCode/Commands/OctaveScriptCommands/RicScriptFeatureImpl.cpp
similarity index 100%
rename from ApplicationCode/Commands/RicScriptFeatureImpl.cpp
rename to ApplicationCode/Commands/OctaveScriptCommands/RicScriptFeatureImpl.cpp
diff --git a/ApplicationCode/Commands/RicScriptFeatureImpl.h b/ApplicationCode/Commands/OctaveScriptCommands/RicScriptFeatureImpl.h
similarity index 100%
rename from ApplicationCode/Commands/RicScriptFeatureImpl.h
rename to ApplicationCode/Commands/OctaveScriptCommands/RicScriptFeatureImpl.h