diff --git a/PlusBuild/BuildAndTest.bat.in b/BuildAndTest.bat.in
similarity index 100%
rename from PlusBuild/BuildAndTest.bat.in
rename to BuildAndTest.bat.in
diff --git a/PlusBuild/BuildAndTest.sh.in b/BuildAndTest.sh.in
similarity index 100%
rename from PlusBuild/BuildAndTest.sh.in
rename to BuildAndTest.sh.in
diff --git a/PlusBuild/CMakeLists.txt b/CMakeLists.txt
similarity index 97%
rename from PlusBuild/CMakeLists.txt
rename to CMakeLists.txt
index 7ec81ab3a..bfac4b210 100644
--- a/PlusBuild/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,6 +201,7 @@ OPTION(PLUS_USE_POLARIS "Provide support for the NDI POLARIS and AURORA" OFF)
 MARK_AS_ADVANCED(PLUS_USE_POLARIS)
 OPTION(PLUS_USE_CERTUS "Provide support for the NDI Certus" OFF)
 MARK_AS_ADVANCED(PLUS_USE_CERTUS)
+
 IF(PLUS_USE_POLARIS)
   MESSAGE("PLUS_USE_POLARIS has been deprecated. Changing to PLUS_USE_NDI instead.")
   SET(PLUS_USE_POLARIS OFF CACHE BOOL "Provide support for the NDI POLARIS and AURORA" FORCE)
@@ -222,7 +223,6 @@ OPTION(PLUS_USE_PHIDGET_SPATIAL_TRACKER "Provide support for the Phidget Spatial
 OPTION(PLUS_USE_3dConnexion_TRACKER "Provide support for the 3dConnexion 3d mouse" OFF)
 OPTION(PLUS_USE_STEALTHLINK "Provide support for the Medtronick StealthLink Server" OFF)
 OPTION(PLUS_USE_IntuitiveDaVinci "Provide support for the da Vinci Surgical System" OFF)
-
 OPTION(PLUS_USE_PHILIPS_3D_ULTRASOUND "Provide support for the Philips ie33 3D ultrasound probe" OFF)
 IF(PLUS_USE_PHILIPS_3D_ULTRASOUND)
   OPTION(PLUS_TEST_PHILIPS_3D_ULTRASOUND "Enable testing of acquisition from Philips 3D ultrasound systems. Enable this only if a Philips device is accessible from this computer. " OFF)
@@ -231,25 +231,11 @@ IF (PLUS_TEST_PHILIPS_3D_ULTRASOUND)
   SET (PLUS_TEST_PHILIPS_3D_ULTRASOUND_IP_ADDRESS "129.100.44.8" CACHE STRING "IP address of the Philips scanner that is used during testing")
 ENDIF(PLUS_TEST_PHILIPS_3D_ULTRASOUND)
 
-OPTION(PLUS_USE_NVIDIA_DVP "Provide support for the NVidia Digital Video Pipeline" OFF)
-IF (PLUS_USE_NVIDIA_DVP)
-  SET(PLUS_USE_NVIDIA_DVP_MODE "GL" CACHE STRING "Choose the graphics backend to use for the DVP.")
-  set_property(CACHE PLUS_USE_NVIDIA_DVP_MODE PROPERTY STRINGS "GL" "CUDA" "D3D9" "D3D10" "D3D11")
-
-  IF( "${PLUS_USE_NVIDIA_DVP_MODE}" STREQUAL "GL" )
-    FIND_PACKAGE(OpenGL REQUIRED)
-    IF( "${OPENGL_INCLUDE_DIR}" STREQUAL "" )
-      MESSAGE(FATAL_ERROR "OPENGL_INCLUDE_DIR could not be populated. Please specify manually. Aborting.")
-    ELSE()
-      IF(NOT EXISTS ${OPENGL_INCLUDE_DIR}/GL/gl.h)
-        MESSAGE(FATAL_ERROR "OPENGL_INCLUDE_DIR: ${OPENGL_INCLUDE_DIR} does not contain GL/gl.h. Aborting.")
-      ENDIF()
-    ENDIF()
-  ENDIF()
-ENDIF()
-
-#-----------------------------------------------------------------------------
 # Other
+
+set(PLUSBUILD_VTK_RENDERING_BACKEND "OpenGL" CACHE STRING "Choose the rendering backend. OpenGL2 is only compatible with more recent graphics cards and does not work on embedded systems like Ultrasonix Windows XPe based systems.")
+set_property(CACHE PLUSBUILD_VTK_RENDERING_BACKEND PROPERTY STRINGS "OpenGL" "OpenGL2")
+
 OPTION (PLUSAPP_TEST_GUI "Enable Sikuli GUI tests" ON)
 
 OPTION (PLUS_TEST_HIGH_ACCURACY_TIMING "Enable testing of high-accuracy timing. High-accuracy timing may not be available on virtual machines and so testing may be turned off to avoid false alarams." ON)
diff --git a/PlusBuild/CTestConfig.cmake b/CTestConfig.cmake
similarity index 100%
rename from PlusBuild/CTestConfig.cmake
rename to CTestConfig.cmake
diff --git a/PlusBuild/External_BiiGOptitrack.cmake b/External_BiiGOptitrack.cmake
similarity index 100%
rename from PlusBuild/External_BiiGOptitrack.cmake
rename to External_BiiGOptitrack.cmake
diff --git a/PlusBuild/External_GrabbieLib.cmake b/External_GrabbieLib.cmake
similarity index 100%
rename from PlusBuild/External_GrabbieLib.cmake
rename to External_GrabbieLib.cmake
diff --git a/PlusBuild/External_ITK.cmake b/External_ITK.cmake
similarity index 100%
rename from PlusBuild/External_ITK.cmake
rename to External_ITK.cmake
diff --git a/PlusBuild/External_IntersonSDKCxx.cmake b/External_IntersonSDKCxx.cmake
similarity index 100%
rename from PlusBuild/External_IntersonSDKCxx.cmake
rename to External_IntersonSDKCxx.cmake
diff --git a/PlusBuild/External_OpenIGTLink.cmake b/External_OpenIGTLink.cmake
similarity index 100%
rename from PlusBuild/External_OpenIGTLink.cmake
rename to External_OpenIGTLink.cmake
diff --git a/PlusBuild/External_PlusApp.cmake b/External_PlusApp.cmake
similarity index 95%
rename from PlusBuild/External_PlusApp.cmake
rename to External_PlusApp.cmake
index e51705bdd..5f0d9b0ee 100644
--- a/PlusBuild/External_PlusApp.cmake
+++ b/External_PlusApp.cmake
@@ -32,7 +32,7 @@ ExternalProject_Add(PlusApp
   #--Download step--------------
   SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME}
   SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD}
-  SVN_REPOSITORY https://subversion.assembla.com/svn/plus/trunk/PlusApp
+  SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4/PlusApp
   ${PLUSBUILD_SVN_REVISION_ARGS}
   #--Configure step-------------
   CMAKE_ARGS 
diff --git a/PlusBuild/External_PlusLib.cmake b/External_PlusLib.cmake
similarity index 83%
rename from PlusBuild/External_PlusLib.cmake
rename to External_PlusLib.cmake
index a62b1c4bb..59764f70b 100644
--- a/PlusBuild/External_PlusLib.cmake
+++ b/External_PlusLib.cmake
@@ -133,24 +133,11 @@ IF ( PLUS_USE_INTELREALSENSE )
   SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS}
     -DINTELREALSENSE_INCLUDE_DIR:PATH=${RSSDK_INCLUDE_DIRS}
     -DINTELREALSENSE_RELEASE_LIB:PATH=${RSSDK_LIBRARY}
-    -DINTELREALSENSE_DEBUG_LIB:PATH=${RSSDK_LIBRARY_DEBUG}
+	-DINTELREALSENSE_DEBUG_LIB:PATH=${RSSDK_LIBRARY_DEBUG}
     #-DINTELREALSENSE_BINARY_DIR:PATH=${INTELREALSENSE_BINARY_DIR}
     )
 ENDIF()
 
-IF( PLUS_USE_NVIDIA_DVP )
-  SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS}
-    -DNVIDIA_DVP_INCLUDE_DIR:PATH=${NVIDIA_DVP_INCLUDE_DIR}
-    -DNVIDIA_DVP_BINARY_DIR:PATH=${NVIDIA_DVP_BINARY_DIR}
-    -DNVIDIA_DVP_LIB_DIR:PATH=${NVIDIA_DVP_LIB_DIR}
-    -DPLUS_USE_NVIDIA_DVP_MODE:STRING=${PLUS_USE_NVIDIA_DVP_MODE}
-    )
-  IF( "${PLUS_USE_NVIDIA_DVP_MODE}" STREQUAL "GL" )
-    SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS}
-      -DOPENGL_INCLUDE_DIR:PATH=${OPENGL_INCLUDE_DIR}
-      )
-  ENDIF()
-ENDIF()
 
 IF ( PLUS_USE_IntuitiveDaVinci )
   SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS}
@@ -172,47 +159,24 @@ IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO )
     SET(WINDOWS_SDK_LIBRARY_DIRS "NOTFOUND")
     get_windowssdk_include_dirs("${_dir}" WINDOWS_SDK_INCLUDE_DIRS)
     get_windowssdk_library_dirs("${_dir}" WINDOWS_SDK_LIBRARY_DIRS)
-
-    # Now check each version to see if it is compatible
-    IF(NOT "${WINDOWS_SDK_INCLUDE_DIRS}" STREQUAL "NOTFOUND" AND NOT "${WINDOWS_SDK_LIBRARY_DIRS}" STREQUAL "NOTFOUND")
-      # Reverse list to put latest version first
-      LIST(REVERSE WINDOWS_SDK_INCLUDE_DIRS)
-      LIST(REVERSE WINDOWS_SDK_LIBRARY_DIRS)
-      LIST(LENGTH WINDOWS_SDK_INCLUDE_DIRS _dir_list_size)
-
-      foreach(_dir_index RANGE ${_dir_list_size})
-        LIST(GET WINDOWS_SDK_INCLUDE_DIRS ${_dir_index} _WINDOWS_SDK_INCLUDE_DIR)
-        LIST(GET WINDOWS_SDK_LIBRARY_DIRS ${_dir_index} _WINDOWS_SDK_LIBARY_DIR)
-
-        # Do not allow ucrt version to be used
-        STRING(FIND ${_WINDOWS_SDK_LIBARY_DIR} "ucrt" _ucrt_found)
-        IF( NOT ${_ucrt_found} EQUAL -1 )
-          continue()
-        ENDIF()
-
-        INCLUDE(TestWindowsSDK)
-        IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE)
-          # Found a compatible Windows SDK
-          break()
-        ENDIF()
-      endforeach()
-    ENDIF()
-    
-    IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE)
-      # Found a compatible Windows SDK
-      break()
-    ENDIF()
+    if(NOT "${WINDOWS_SDK_INCLUDE_DIRS}" STREQUAL "NOTFOUND" AND NOT "${WINDOWS_SDK_LIBRARY_DIRS}" STREQUAL "NOTFOUND")
+      INCLUDE(TestWindowsSDK)
+      IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE)
+        # Found a compatible Windows SDK
+        break()
+      ENDIF()
+    endif()
   endforeach()
-
-  IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE)
+  if (PLUS_WINDOWS_SDK_IS_COMPATIBLE)
+    STRING(REPLACE ";" "#" _TMP_INCLUDE_STR "${WINDOWS_SDK_INCLUDE_DIRS}")
+    STRING(REPLACE ";" "#" _TMP_LIB_STR "${WINDOWS_SDK_LIBRARY_DIRS}")
     SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS}
-      -DWINDOWS_SDK_INCLUDE_DIRS:PATH=${_WINDOWS_SDK_INCLUDE_DIR}
-      -DWINDOWS_SDK_LIBRARY_DIRS:PATH=${_WINDOWS_SDK_LIBARY_DIR}
+      -DWINDOWS_SDK_INCLUDE_DIRS:STRING=${_TMP_INCLUDE_STR}
+      -DWINDOWS_SDK_LIBRARY_DIRS:STRING=${_TMP_LIB_STR}
       )
-    MESSAGE(STATUS "Sending Windows SDK: ${_WINDOWS_SDK_LIBARY_DIR} to PlusLib.")
-  ELSE()
-    MESSAGE(FATAL_ERROR "Windows SDKs found at ${WINDOWS_SDK_ROOT_DIRS} are not compatible with Plus")
-  ENDIF()
+  else()
+    MESSAGE(WARNING "Windows SDKs found at ${WINDOWS_SDK_ROOT_DIRS} are not compatible with Plus")
+  endif()
 ENDIF()
 
 IF ( PLUS_USE_MMF_VIDEO )
@@ -291,7 +255,7 @@ ExternalProject_Add(PlusLib
   #--Download step--------------
   SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME}
   SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD}
-  SVN_REPOSITORY https://subversion.assembla.com/svn/plus/trunk/PlusLib
+  SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4/PlusLib
   ${PLUSBUILD_SVN_REVISION_ARGS}
   #--Configure step-------------
   CMAKE_ARGS
@@ -336,7 +300,6 @@ ExternalProject_Add(PlusLib
     -DPLUS_USE_MMF_VIDEO:BOOL=${PLUS_USE_MMF_VIDEO}
     -DPLUS_USE_STEALTHLINK:BOOL=${PLUS_USE_STEALTHLINK}
     -DPLUS_USE_PHILIPS_3D_ULTRASOUND:BOOL=${PLUS_USE_PHILIPS_3D_ULTRASOUND}
-    -DPLUS_USE_NVIDIA_DVP:BOOL=${PLUS_USE_NVIDIA_DVP}
     -DBUILD_DOCUMENTATION:BOOL=${PLUSBUILD_DOCUMENTATION}
     -DPLUS_TEST_HIGH_ACCURACY_TIMING:BOOL=${PLUS_TEST_HIGH_ACCURACY_TIMING}
     ${PLUSBUILD_ADDITIONAL_SDK_ARGS}
diff --git a/PlusBuild/External_PlusLibData.cmake b/External_PlusLibData.cmake
similarity index 89%
rename from PlusBuild/External_PlusLibData.cmake
rename to External_PlusLibData.cmake
index 00a147cc9..ea6163bde 100644
--- a/PlusBuild/External_PlusLibData.cmake
+++ b/External_PlusLibData.cmake
@@ -14,7 +14,7 @@ ExternalProject_Add(PlusLibData
   #--Download step--------------
   SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME}
   SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD}
-  SVN_REPOSITORY https://subversion.assembla.com/svn/plus/trunk/PlusLibData
+  SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4/PlusLibData
   ${PLUSLIBDATA_SVN_REV}
   #--Configure step-------------
   CONFIGURE_COMMAND ""
diff --git a/PlusBuild/External_PlusModelCatalog.cmake b/External_PlusModelCatalog.cmake
similarity index 100%
rename from PlusBuild/External_PlusModelCatalog.cmake
rename to External_PlusModelCatalog.cmake
diff --git a/PlusBuild/External_Tesseract.cmake b/External_Tesseract.cmake
similarity index 100%
rename from PlusBuild/External_Tesseract.cmake
rename to External_Tesseract.cmake
diff --git a/PlusBuild/External_VTK.cmake b/External_VTK.cmake
similarity index 96%
rename from PlusBuild/External_VTK.cmake
rename to External_VTK.cmake
index 9691cbe5f..4d1ab7a9f 100644
--- a/PlusBuild/External_VTK.cmake
+++ b/External_VTK.cmake
@@ -198,6 +198,7 @@ ELSE(VTK_DIR)
         -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP"
         -DVTK_QT_VERSION:STRING=${QT_VERSION_MAJOR}
         -DVTK_WRAP_PYTHON:BOOL=OFF
+        -DVTK_RENDERING_BACKEND=${PLUSBUILD_VTK_RENDERING_BACKEND}
     #--Build step-----------------
     BUILD_ALWAYS 1
     #--Install step-----------------
diff --git a/PlusBuild/Modules/FindCapistrano.cmake b/Modules/FindCapistrano.cmake
similarity index 100%
rename from PlusBuild/Modules/FindCapistrano.cmake
rename to Modules/FindCapistrano.cmake
diff --git a/PlusBuild/Modules/FindICCapturing.cmake b/Modules/FindICCapturing.cmake
similarity index 100%
rename from PlusBuild/Modules/FindICCapturing.cmake
rename to Modules/FindICCapturing.cmake
diff --git a/PlusBuild/Modules/FindInterson.cmake b/Modules/FindInterson.cmake
similarity index 100%
rename from PlusBuild/Modules/FindInterson.cmake
rename to Modules/FindInterson.cmake
diff --git a/PlusBuild/Modules/FindIntuitiveDaVinci.cmake b/Modules/FindIntuitiveDaVinci.cmake
similarity index 100%
rename from PlusBuild/Modules/FindIntuitiveDaVinci.cmake
rename to Modules/FindIntuitiveDaVinci.cmake
diff --git a/PlusBuild/Modules/FindMicronTracker.cmake b/Modules/FindMicronTracker.cmake
similarity index 100%
rename from PlusBuild/Modules/FindMicronTracker.cmake
rename to Modules/FindMicronTracker.cmake
diff --git a/PlusBuild/Modules/FindNDIOAPI.cmake b/Modules/FindNDIOAPI.cmake
similarity index 100%
rename from PlusBuild/Modules/FindNDIOAPI.cmake
rename to Modules/FindNDIOAPI.cmake
diff --git a/PlusBuild/Modules/FindOptimetSmart32SDK.cmake b/Modules/FindOptimetSmart32SDK.cmake
similarity index 100%
rename from PlusBuild/Modules/FindOptimetSmart32SDK.cmake
rename to Modules/FindOptimetSmart32SDK.cmake
diff --git a/PlusBuild/Modules/FindPhilips.cmake b/Modules/FindPhilips.cmake
similarity index 100%
rename from PlusBuild/Modules/FindPhilips.cmake
rename to Modules/FindPhilips.cmake
diff --git a/PlusBuild/Modules/FindRSSDK.cmake b/Modules/FindRSSDK.cmake
similarity index 100%
rename from PlusBuild/Modules/FindRSSDK.cmake
rename to Modules/FindRSSDK.cmake
diff --git a/PlusBuild/Modules/FindSTEALTHLINK.cmake b/Modules/FindSTEALTHLINK.cmake
similarity index 100%
rename from PlusBuild/Modules/FindSTEALTHLINK.cmake
rename to Modules/FindSTEALTHLINK.cmake
diff --git a/PlusBuild/Modules/FindTelemed.cmake b/Modules/FindTelemed.cmake
similarity index 100%
rename from PlusBuild/Modules/FindTelemed.cmake
rename to Modules/FindTelemed.cmake
diff --git a/PlusBuild/Modules/FindThorLabs.cmake b/Modules/FindThorLabs.cmake
similarity index 100%
rename from PlusBuild/Modules/FindThorLabs.cmake
rename to Modules/FindThorLabs.cmake
diff --git a/PlusBuild/Modules/FindTrackingTools.cmake b/Modules/FindTrackingTools.cmake
similarity index 100%
rename from PlusBuild/Modules/FindTrackingTools.cmake
rename to Modules/FindTrackingTools.cmake
diff --git a/PlusBuild/Modules/FindULTRASONIX_SDK.cmake b/Modules/FindULTRASONIX_SDK.cmake
similarity index 100%
rename from PlusBuild/Modules/FindULTRASONIX_SDK.cmake
rename to Modules/FindULTRASONIX_SDK.cmake
diff --git a/PlusBuild/Modules/FindWindowsSDK.cmake b/Modules/FindWindowsSDK.cmake
similarity index 96%
rename from PlusBuild/Modules/FindWindowsSDK.cmake
rename to Modules/FindWindowsSDK.cmake
index 537b7a873..399063904 100644
--- a/PlusBuild/Modules/FindWindowsSDK.cmake
+++ b/Modules/FindWindowsSDK.cmake
@@ -284,8 +284,6 @@ if(_winsdk_msvc_greater_1310) # Newer than VS .NET/VS Toolkit 2003
 
     _winsdk_check_microsoft_sdks_registry(v10.0A)
 
-    #10.0.10056.0 10.0.10240.0 10.0.10586.0 10.0.14393.0
-    
     # Windows Software Development Kit (SDK) for Windows 10
     _winsdk_check_microsoft_sdks_registry(v10.0 10.0.14393.0)
     _winsdk_check_windows_kits_registry("Windows Kits 10" 10.0.14393.0 KitsRoot10)
@@ -409,10 +407,6 @@ if(_win_sdk_dirs)
   windowssdk_name_lookup("${WINDOWSSDK_LATEST_DIR}"
     WINDOWSSDK_LATEST_NAME)
   set(WINDOWSSDK_DIRS ${_win_sdk_dirs})
-  
-  if(_WINDOWSSDK_ANNOUNCE)
-    message(STATUS "FindWindowsSDK: Using ${WINDOWSSDK_LATEST_NAME}.")
-  endif()
 
   # Fallback, in case no preference found.
   set(WINDOWSSDK_PREFERRED_DIR "${WINDOWSSDK_LATEST_DIR}")
diff --git a/Modules/PlusTestWindowsSdkCompatible.cxx b/Modules/PlusTestWindowsSdkCompatible.cxx
new file mode 100644
index 000000000..fe9060772
--- /dev/null
+++ b/Modules/PlusTestWindowsSdkCompatible.cxx
@@ -0,0 +1,13 @@
+// Minimal test for Windows SDK compatibility
+
+#include <Mfapi.h>
+
+int main()
+{
+  
+  // We use these constants and they are only defined in Windows SDK 7.1 and later
+  GUID guid1=MF_MT_FRAME_RATE_RANGE_MIN;
+  GUID guid2=MF_MT_FRAME_RATE_RANGE_MAX;
+  
+  return 0;
+}
diff --git a/PlusBuild/Modules/TestWindowsSDK.cmake b/Modules/TestWindowsSDK.cmake
similarity index 76%
rename from PlusBuild/Modules/TestWindowsSDK.cmake
rename to Modules/TestWindowsSDK.cmake
index b86919406..8259eceb8 100644
--- a/PlusBuild/Modules/TestWindowsSDK.cmake
+++ b/Modules/TestWindowsSDK.cmake
@@ -4,16 +4,16 @@ TRY_COMPILE(PLUS_WINDOWS_SDK_IS_COMPATIBLE
             "${CMAKE_BINARY_DIR}/CMakeTmp/WindowsSdkCompatibility"
             "${CMAKE_CURRENT_SOURCE_DIR}/Modules/PlusTestWindowsSdkCompatible.cxx"
             CMAKE_FLAGS
-              "-DINCLUDE_DIRECTORIES:STRING=${_WINDOWS_SDK_INCLUDE_DIR}"
-              "-DLINK_DIRECTORIES:STRING=${_WINDOWS_SDK_LIBRARY_DIR}"
-              "-DLINK_LIBRARIES:STRING=mfuuid.lib;Evr.lib;Mf.lib;Mfplat.lib;Shlwapi.lib;Mfreadwrite.lib;Strmiids.lib"
+              "-DINCLUDE_DIRECTORIES:STRING=${WINDOWS_SDK_INCLUDE_DIRS}"
+              "-DLINK_DIRECTORIES:STRING=${WINDOWS_SDK_LIBRARY_DIRS}"
+              "-DLINK_LIBRARIES:STRING=mfuuid.lib"
             OUTPUT_VARIABLE OUTPUT)
 
 IF(PLUS_WINDOWS_SDK_IS_COMPATIBLE)
   MESSAGE(STATUS "Checking if the latest Windows SDK is compatible -- yes")
   SET(PLUS_WINDOWS_SDK_IS_COMPATIBLE 1 CACHE INTERNAL "Windows SDK is compatible with Plus")
   WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
-    "Determining if the C++ compiler supports type GUID "
+    "Determining if the C++ compiler supports type bool "
     "passed with the following output:\n"
     "${OUTPUT}\n" APPEND)
 ELSE(PLUS_WINDOWS_SDK_IS_COMPATIBLE)
diff --git a/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx b/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx
deleted file mode 100644
index 424b07472..000000000
--- a/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Minimal test for Windows SDK compatibility
-
-// Ensure library files are available at the given link directories
-#pragma comment(lib, "Evr.lib")
-#pragma comment(lib, "Mf.lib")
-#pragma comment(lib, "Mfplat.lib")
-#pragma comment(lib, "Shlwapi.lib")
-#pragma comment(lib, "Mfreadwrite.lib")
-#pragma comment(lib, "mfuuid.lib")
-#pragma comment(lib, "Strmiids.lib")
-
-// Ensure include files are available at the given link directories
-#include <Mfapi.h>
-
-int main()
-{
-  
-  // We use these constants and they are only defined in Windows SDK 7.1 and later
-  GUID guid1=MF_MT_FRAME_RATE_RANGE_MIN;
-  GUID guid2=MF_MT_FRAME_RATE_RANGE_MAX;
-  
-  return 0;
-}
\ No newline at end of file
diff --git a/PlusBuild/PlusBuildAndTest.bat.in b/PlusBuild/PlusBuildAndTest.bat.in
deleted file mode 100644
index 3a98da4f9..000000000
--- a/PlusBuild/PlusBuildAndTest.bat.in
+++ /dev/null
@@ -1,25 +0,0 @@
-
-@ECHO off
-REM Hide all your directories from users
-
-REM Input parameters:
-REM if "%1" == ""   goto experimental
-REM if "%1" == "-E" goto experimental
-REM if "%1" == "-N" goto nightly
-REM if "%1" == "-C" goto continuous
-REM if "%1" == "-I" goto individual
-
-@REM Run PlusBuild tests 
-@REM Run PlusLib tests 
-cd /d "${CMAKE_CURRENT_BINARY_DIR}"
-call BuildAndTest.bat %1
-
-@REM Run PlusLib tests 
-cd /d "${PLUSBUILD_BIN_DIR_WIN}\PlusLib-bin"
-call BuildAndTest.bat %1
-
-@REM Run PlusApp tests 
-cd /d "${PLUSBUILD_BIN_DIR_WIN}\PlusApp-bin"
-call BuildAndTest.bat %1
-
-cd /d "${PLUSBUILD_BIN_DIR_WIN}"
\ No newline at end of file
diff --git a/PlusBuildAndTest.bat.in b/PlusBuildAndTest.bat.in
new file mode 100644
index 000000000..bbd9d79a5
--- /dev/null
+++ b/PlusBuildAndTest.bat.in
@@ -0,0 +1,21 @@
+@ECHO off
+REM Update and run all tests
+REM Arguments: [mode]
+REM mode:
+REM  -E experimental (default)
+REM  -N nightly
+REM  -C continuous
+
+@REM Run PlusBuild tests 
+cd /d "${CMAKE_CURRENT_BINARY_DIR}"
+call BuildAndTest.bat %1
+
+@REM Run PlusLib tests 
+cd /d "${PLUSBUILD_BIN_DIR_WIN}\PlusLib-bin"
+call BuildAndTest.bat %1
+
+@REM Run PlusApp tests 
+cd /d "${PLUSBUILD_BIN_DIR_WIN}\PlusApp-bin"
+call BuildAndTest.bat %1
+
+cd /d "${PLUSBUILD_BIN_DIR_WIN}"
diff --git a/PlusBuild/PlusBuildAndTest.sh.in b/PlusBuildAndTest.sh.in
similarity index 100%
rename from PlusBuild/PlusBuildAndTest.sh.in
rename to PlusBuildAndTest.sh.in