diff --git a/Samples/5_Domain_Specific/CMakeLists.txt b/Samples/5_Domain_Specific/CMakeLists.txt
index db46ed0c..9ded8e5a 100644
--- a/Samples/5_Domain_Specific/CMakeLists.txt
+++ b/Samples/5_Domain_Specific/CMakeLists.txt
@@ -16,11 +16,8 @@ add_subdirectory(dwtHaar1D)
 add_subdirectory(dxtc)
 add_subdirectory(fastWalshTransform)
 add_subdirectory(fluidsGL)
-#add_subdirectory(fluidsGLES)
 add_subdirectory(marchingCubes)
 add_subdirectory(nbody)
-#add_subdirectory(nbody_opengles)
-#add_subdirectory(nbody_screen)
 add_subdirectory(p2pBandwidthLatencyTest)
 add_subdirectory(postProcessGL)
 add_subdirectory(quasirandomGenerator)
@@ -30,9 +27,6 @@ add_subdirectory(simpleD3D11)
 add_subdirectory(simpleD3D11Texture)
 add_subdirectory(simpleD3D12)
 add_subdirectory(simpleGL)
-#add_subdirectory(simpleGLES)
-#add_subdirectory(simpleGLES_EGLOutput)
-#add_subdirectory(simpleGLES_screen)
 add_subdirectory(simpleVulkan)
 add_subdirectory(simpleVulkanMMAP)
 add_subdirectory(smokeParticles)
diff --git a/Samples/5_Domain_Specific/fluidsGLES/CMakeLists.txt b/Samples/5_Domain_Specific/fluidsGLES/CMakeLists.txt
deleted file mode 100644
index 25b5b7c8..00000000
--- a/Samples/5_Domain_Specific/fluidsGLES/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
-
-project(fluidsGLES LANGUAGES C CXX CUDA)
-
-find_package(CUDAToolkit REQUIRED)
-
-set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    # set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -G")  # enable cuda-gdb (expensive)
-endif()
-
-# Include directories and libraries
-include_directories(../../../Common)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-# Source file
-# Add target for fluidsGLES
-add_executable(fluidsGLES fluidsGLES.cu)
-
-target_compile_options(fluidsGLES PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
-
-target_compile_features(fluidsGLES PRIVATE cxx_std_17 cuda_std_17)
-
-set_target_properties(fluidsGLES PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-else()
-    message(STATUS "Will not build sample fluidsGLES - requires Linux OS")
-endif()
\ No newline at end of file
diff --git a/Samples/5_Domain_Specific/fluidsGLES/.vscode/c_cpp_properties.json b/Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/c_cpp_properties.json
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/.vscode/c_cpp_properties.json
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/c_cpp_properties.json
diff --git a/Samples/5_Domain_Specific/fluidsGLES/.vscode/extensions.json b/Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/extensions.json
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/.vscode/extensions.json
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/extensions.json
diff --git a/Samples/5_Domain_Specific/fluidsGLES/.vscode/launch.json b/Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/launch.json
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/.vscode/launch.json
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/launch.json
diff --git a/Samples/5_Domain_Specific/fluidsGLES/.vscode/tasks.json b/Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/tasks.json
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/.vscode/tasks.json
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/.vscode/tasks.json
diff --git a/Samples/8_Platform_Specific/Tegra/fluidsGLES/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/fluidsGLES/CMakeLists.txt
new file mode 100644
index 00000000..37a9836c
--- /dev/null
+++ b/Samples/8_Platform_Specific/Tegra/fluidsGLES/CMakeLists.txt
@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+project(fluidsGLES LANGUAGES C CXX CUDA)
+
+find_package(CUDAToolkit REQUIRED)
+
+set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -G")  # enable cuda-gdb (expensive)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    find_package (OpenGL COMPONENTS EGL GLES2)
+    if(${OpenGL_EGL_FOUND})
+        # Source file
+        # Add target for fluidsGLES
+        add_executable(fluidsGLES 
+            fluidsGLES.cpp
+            fluidsGLES_kernels.cu
+        )
+
+        target_compile_options(fluidsGLES PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+
+        target_compile_features(fluidsGLES PRIVATE cxx_std_17 cuda_std_17)
+
+        set_target_properties(fluidsGLES PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+        target_include_directories(fluidsGLES PUBLIC
+            ${OPENGL_INCLUDE_DIRS}
+            ${CUDAToolkit_INCLUDE_DIRS}
+            ../../../Common
+        )
+
+        target_link_libraries(fluidsGLES
+            ${OPENGL_LIBRARIES}
+            CUDA::cuda_driver
+        )
+    else()
+        message(STATUS "EGL not found - will not build sample 'fluidsGLES'")
+    endif()
+else()
+    message(STATUS "Will not build sample fluidsGLES - requires Linux OS")
+endif()
diff --git a/Samples/5_Domain_Specific/fluidsGLES/Makefile b/Samples/8_Platform_Specific/Tegra/fluidsGLES/Makefile
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/Makefile
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/Makefile
diff --git a/Samples/5_Domain_Specific/fluidsGLES/NsightEclipse.xml b/Samples/8_Platform_Specific/Tegra/fluidsGLES/NsightEclipse.xml
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/NsightEclipse.xml
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/NsightEclipse.xml
diff --git a/Samples/5_Domain_Specific/fluidsGLES/README.md b/Samples/8_Platform_Specific/Tegra/fluidsGLES/README.md
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/README.md
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/README.md
diff --git a/Samples/5_Domain_Specific/fluidsGLES/data/ref_fluidsGLES.ppm b/Samples/8_Platform_Specific/Tegra/fluidsGLES/data/ref_fluidsGLES.ppm
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/data/ref_fluidsGLES.ppm
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/data/ref_fluidsGLES.ppm
diff --git a/Samples/5_Domain_Specific/fluidsGLES/defines.h b/Samples/8_Platform_Specific/Tegra/fluidsGLES/defines.h
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/defines.h
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/defines.h
diff --git a/Samples/5_Domain_Specific/fluidsGLES/findgleslib.mk b/Samples/8_Platform_Specific/Tegra/fluidsGLES/findgleslib.mk
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/findgleslib.mk
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/findgleslib.mk
diff --git a/Samples/5_Domain_Specific/fluidsGLES/fluidsGLES.cpp b/Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES.cpp
similarity index 99%
rename from Samples/5_Domain_Specific/fluidsGLES/fluidsGLES.cpp
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES.cpp
index 06730c81..9166e597 100644
--- a/Samples/5_Domain_Specific/fluidsGLES/fluidsGLES.cpp
+++ b/Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES.cpp
@@ -40,7 +40,7 @@ void error_exit(const char* format, ... )
 #include <cufft.h>
 
 // CUDA helper functions
-#include <helper_functions.h>
+#include "helper_functions.h"
 #include <rendercheck_gles.h>
 #include <helper_cuda.h>
 
diff --git a/Samples/5_Domain_Specific/fluidsGLES/fluidsGLES_kernels.cu b/Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES_kernels.cu
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/fluidsGLES_kernels.cu
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES_kernels.cu
diff --git a/Samples/5_Domain_Specific/fluidsGLES/fluidsGLES_kernels.cuh b/Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES_kernels.cuh
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/fluidsGLES_kernels.cuh
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES_kernels.cuh
diff --git a/Samples/5_Domain_Specific/fluidsGLES/fluidsGLES_kernels.h b/Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES_kernels.h
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/fluidsGLES_kernels.h
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES_kernels.h
diff --git a/Samples/5_Domain_Specific/fluidsGLES/graphics_interface.h b/Samples/8_Platform_Specific/Tegra/fluidsGLES/graphics_interface.h
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/graphics_interface.h
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/graphics_interface.h
diff --git a/Samples/5_Domain_Specific/fluidsGLES/mesh.frag.glsl b/Samples/8_Platform_Specific/Tegra/fluidsGLES/mesh.frag.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/mesh.frag.glsl
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/mesh.frag.glsl
diff --git a/Samples/5_Domain_Specific/fluidsGLES/mesh.vert.glsl b/Samples/8_Platform_Specific/Tegra/fluidsGLES/mesh.vert.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/fluidsGLES/mesh.vert.glsl
rename to Samples/8_Platform_Specific/Tegra/fluidsGLES/mesh.vert.glsl
diff --git a/Samples/5_Domain_Specific/nbody_opengles/.vscode/c_cpp_properties.json b/Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/c_cpp_properties.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/.vscode/c_cpp_properties.json
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/c_cpp_properties.json
diff --git a/Samples/5_Domain_Specific/nbody_opengles/.vscode/extensions.json b/Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/extensions.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/.vscode/extensions.json
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/extensions.json
diff --git a/Samples/5_Domain_Specific/nbody_opengles/.vscode/launch.json b/Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/launch.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/.vscode/launch.json
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/launch.json
diff --git a/Samples/5_Domain_Specific/nbody_opengles/.vscode/tasks.json b/Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/tasks.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/.vscode/tasks.json
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/.vscode/tasks.json
diff --git a/Samples/5_Domain_Specific/nbody_opengles/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/nbody_opengles/CMakeLists.txt
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/CMakeLists.txt
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/CMakeLists.txt
diff --git a/Samples/5_Domain_Specific/nbody_opengles/Makefile b/Samples/8_Platform_Specific/Tegra/nbody_opengles/Makefile
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/Makefile
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/Makefile
diff --git a/Samples/5_Domain_Specific/nbody_opengles/NsightEclipse.xml b/Samples/8_Platform_Specific/Tegra/nbody_opengles/NsightEclipse.xml
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/NsightEclipse.xml
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/NsightEclipse.xml
diff --git a/Samples/5_Domain_Specific/nbody_opengles/README.md b/Samples/8_Platform_Specific/Tegra/nbody_opengles/README.md
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/README.md
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/README.md
diff --git a/Samples/5_Domain_Specific/nbody_opengles/bodysystem.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystem.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/bodysystem.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystem.h
diff --git a/Samples/5_Domain_Specific/nbody_opengles/bodysystemcpu.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcpu.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/bodysystemcpu.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcpu.h
diff --git a/Samples/5_Domain_Specific/nbody_opengles/bodysystemcpu_impl.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcpu_impl.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/bodysystemcpu_impl.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcpu_impl.h
diff --git a/Samples/5_Domain_Specific/nbody_opengles/bodysystemcuda.cu b/Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcuda.cu
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/bodysystemcuda.cu
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcuda.cu
diff --git a/Samples/5_Domain_Specific/nbody_opengles/bodysystemcuda.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcuda.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/bodysystemcuda.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcuda.h
diff --git a/Samples/5_Domain_Specific/nbody_opengles/bodysystemcuda_impl.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcuda_impl.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/bodysystemcuda_impl.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/bodysystemcuda_impl.h
diff --git a/Samples/5_Domain_Specific/nbody_opengles/findgleslib.mk b/Samples/8_Platform_Specific/Tegra/nbody_opengles/findgleslib.mk
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/findgleslib.mk
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/findgleslib.mk
diff --git a/Samples/5_Domain_Specific/nbody_opengles/galaxy_20K.bin b/Samples/8_Platform_Specific/Tegra/nbody_opengles/galaxy_20K.bin
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/galaxy_20K.bin
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/galaxy_20K.bin
diff --git a/Samples/5_Domain_Specific/nbody_opengles/nbody_opengles.cpp b/Samples/8_Platform_Specific/Tegra/nbody_opengles/nbody_opengles.cpp
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/nbody_opengles.cpp
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/nbody_opengles.cpp
diff --git a/Samples/5_Domain_Specific/nbody_opengles/render_particles.cpp b/Samples/8_Platform_Specific/Tegra/nbody_opengles/render_particles.cpp
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/render_particles.cpp
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/render_particles.cpp
diff --git a/Samples/5_Domain_Specific/nbody_opengles/render_particles.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/render_particles.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/render_particles.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/render_particles.h
diff --git a/Samples/5_Domain_Specific/nbody_opengles/tipsy.h b/Samples/8_Platform_Specific/Tegra/nbody_opengles/tipsy.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_opengles/tipsy.h
rename to Samples/8_Platform_Specific/Tegra/nbody_opengles/tipsy.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/.vscode/c_cpp_properties.json b/Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/c_cpp_properties.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/.vscode/c_cpp_properties.json
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/c_cpp_properties.json
diff --git a/Samples/5_Domain_Specific/nbody_screen/.vscode/extensions.json b/Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/extensions.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/.vscode/extensions.json
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/extensions.json
diff --git a/Samples/5_Domain_Specific/nbody_screen/.vscode/launch.json b/Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/launch.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/.vscode/launch.json
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/launch.json
diff --git a/Samples/5_Domain_Specific/nbody_screen/.vscode/tasks.json b/Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/tasks.json
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/.vscode/tasks.json
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/.vscode/tasks.json
diff --git a/Samples/5_Domain_Specific/nbody_screen/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/nbody_screen/CMakeLists.txt
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/CMakeLists.txt
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/CMakeLists.txt
diff --git a/Samples/5_Domain_Specific/nbody_screen/Makefile b/Samples/8_Platform_Specific/Tegra/nbody_screen/Makefile
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/Makefile
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/Makefile
diff --git a/Samples/5_Domain_Specific/nbody_screen/NsightEclipse.xml b/Samples/8_Platform_Specific/Tegra/nbody_screen/NsightEclipse.xml
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/NsightEclipse.xml
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/NsightEclipse.xml
diff --git a/Samples/5_Domain_Specific/nbody_screen/README.md b/Samples/8_Platform_Specific/Tegra/nbody_screen/README.md
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/README.md
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/README.md
diff --git a/Samples/5_Domain_Specific/nbody_screen/bodysystem.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystem.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/bodysystem.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystem.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/bodysystemcpu.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcpu.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/bodysystemcpu.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcpu.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/bodysystemcpu_impl.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcpu_impl.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/bodysystemcpu_impl.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcpu_impl.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/bodysystemcuda.cu b/Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcuda.cu
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/bodysystemcuda.cu
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcuda.cu
diff --git a/Samples/5_Domain_Specific/nbody_screen/bodysystemcuda.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcuda.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/bodysystemcuda.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcuda.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/bodysystemcuda_impl.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcuda_impl.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/bodysystemcuda_impl.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/bodysystemcuda_impl.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/findgleslib.mk b/Samples/8_Platform_Specific/Tegra/nbody_screen/findgleslib.mk
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/findgleslib.mk
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/findgleslib.mk
diff --git a/Samples/5_Domain_Specific/nbody_screen/galaxy_20K.bin b/Samples/8_Platform_Specific/Tegra/nbody_screen/galaxy_20K.bin
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/galaxy_20K.bin
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/galaxy_20K.bin
diff --git a/Samples/5_Domain_Specific/nbody_screen/nbody_screen.cpp b/Samples/8_Platform_Specific/Tegra/nbody_screen/nbody_screen.cpp
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/nbody_screen.cpp
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/nbody_screen.cpp
diff --git a/Samples/5_Domain_Specific/nbody_screen/render_particles.cpp b/Samples/8_Platform_Specific/Tegra/nbody_screen/render_particles.cpp
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/render_particles.cpp
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/render_particles.cpp
diff --git a/Samples/5_Domain_Specific/nbody_screen/render_particles.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/render_particles.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/render_particles.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/render_particles.h
diff --git a/Samples/5_Domain_Specific/nbody_screen/tipsy.h b/Samples/8_Platform_Specific/Tegra/nbody_screen/tipsy.h
similarity index 100%
rename from Samples/5_Domain_Specific/nbody_screen/tipsy.h
rename to Samples/8_Platform_Specific/Tegra/nbody_screen/tipsy.h
diff --git a/Samples/5_Domain_Specific/simpleGLES/.vscode/c_cpp_properties.json b/Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/c_cpp_properties.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/.vscode/c_cpp_properties.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/c_cpp_properties.json
diff --git a/Samples/5_Domain_Specific/simpleGLES/.vscode/extensions.json b/Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/extensions.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/.vscode/extensions.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/extensions.json
diff --git a/Samples/5_Domain_Specific/simpleGLES/.vscode/launch.json b/Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/launch.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/.vscode/launch.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/launch.json
diff --git a/Samples/5_Domain_Specific/simpleGLES/.vscode/tasks.json b/Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/tasks.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/.vscode/tasks.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/.vscode/tasks.json
diff --git a/Samples/5_Domain_Specific/simpleGLES/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/simpleGLES/CMakeLists.txt
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/CMakeLists.txt
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/CMakeLists.txt
diff --git a/Samples/5_Domain_Specific/simpleGLES/Makefile b/Samples/8_Platform_Specific/Tegra/simpleGLES/Makefile
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/Makefile
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/Makefile
diff --git a/Samples/5_Domain_Specific/simpleGLES/NsightEclipse.xml b/Samples/8_Platform_Specific/Tegra/simpleGLES/NsightEclipse.xml
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/NsightEclipse.xml
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/NsightEclipse.xml
diff --git a/Samples/5_Domain_Specific/simpleGLES/README.md b/Samples/8_Platform_Specific/Tegra/simpleGLES/README.md
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/README.md
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/README.md
diff --git a/Samples/5_Domain_Specific/simpleGLES/data/ref_simpleGL.bin b/Samples/8_Platform_Specific/Tegra/simpleGLES/data/ref_simpleGL.bin
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/data/ref_simpleGL.bin
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/data/ref_simpleGL.bin
diff --git a/Samples/5_Domain_Specific/simpleGLES/findgleslib.mk b/Samples/8_Platform_Specific/Tegra/simpleGLES/findgleslib.mk
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/findgleslib.mk
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/findgleslib.mk
diff --git a/Samples/5_Domain_Specific/simpleGLES/graphics_interface.c b/Samples/8_Platform_Specific/Tegra/simpleGLES/graphics_interface.c
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/graphics_interface.c
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/graphics_interface.c
diff --git a/Samples/5_Domain_Specific/simpleGLES/mesh.frag.glsl b/Samples/8_Platform_Specific/Tegra/simpleGLES/mesh.frag.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/mesh.frag.glsl
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/mesh.frag.glsl
diff --git a/Samples/5_Domain_Specific/simpleGLES/mesh.vert.glsl b/Samples/8_Platform_Specific/Tegra/simpleGLES/mesh.vert.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/mesh.vert.glsl
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/mesh.vert.glsl
diff --git a/Samples/5_Domain_Specific/simpleGLES/simpleGLES.cu b/Samples/8_Platform_Specific/Tegra/simpleGLES/simpleGLES.cu
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES/simpleGLES.cu
rename to Samples/8_Platform_Specific/Tegra/simpleGLES/simpleGLES.cu
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/c_cpp_properties.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/c_cpp_properties.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/c_cpp_properties.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/c_cpp_properties.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/extensions.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/extensions.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/extensions.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/extensions.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/launch.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/launch.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/launch.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/launch.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/tasks.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/tasks.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/.vscode/tasks.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/.vscode/tasks.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/CMakeLists.txt
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/CMakeLists.txt
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/CMakeLists.txt
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/Makefile b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/Makefile
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/Makefile
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/Makefile
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/NsightEclipse.xml b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/NsightEclipse.xml
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/NsightEclipse.xml
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/NsightEclipse.xml
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/README.md b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/README.md
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/README.md
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/README.md
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/data/ref_simpleGLES_EGLOutput.bin b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/data/ref_simpleGLES_EGLOutput.bin
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/data/ref_simpleGLES_EGLOutput.bin
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/data/ref_simpleGLES_EGLOutput.bin
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/findgleslib.mk b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/findgleslib.mk
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/findgleslib.mk
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/findgleslib.mk
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/graphics_interface_egloutput_via_egl.c b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/graphics_interface_egloutput_via_egl.c
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/graphics_interface_egloutput_via_egl.c
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/graphics_interface_egloutput_via_egl.c
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/mesh.frag.glsl b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/mesh.frag.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/mesh.frag.glsl
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/mesh.frag.glsl
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/mesh.vert.glsl b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/mesh.vert.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/mesh.vert.glsl
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/mesh.vert.glsl
diff --git a/Samples/5_Domain_Specific/simpleGLES_EGLOutput/simpleGLES_EGLOutput.cu b/Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/simpleGLES_EGLOutput.cu
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_EGLOutput/simpleGLES_EGLOutput.cu
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_EGLOutput/simpleGLES_EGLOutput.cu
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/.vscode/c_cpp_properties.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/c_cpp_properties.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/.vscode/c_cpp_properties.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/c_cpp_properties.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/.vscode/extensions.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/extensions.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/.vscode/extensions.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/extensions.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/.vscode/launch.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/launch.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/.vscode/launch.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/launch.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/.vscode/tasks.json b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/tasks.json
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/.vscode/tasks.json
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/.vscode/tasks.json
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/CMakeLists.txt
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/CMakeLists.txt
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/CMakeLists.txt
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/Makefile b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/Makefile
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/Makefile
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/Makefile
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/NsightEclipse.xml b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/NsightEclipse.xml
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/NsightEclipse.xml
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/NsightEclipse.xml
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/README.md b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/README.md
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/README.md
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/README.md
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/data/ref_simpleGLES_screen.bin b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/data/ref_simpleGLES_screen.bin
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/data/ref_simpleGLES_screen.bin
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/data/ref_simpleGLES_screen.bin
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/findgleslib.mk b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/findgleslib.mk
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/findgleslib.mk
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/findgleslib.mk
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/graphics_interface.c b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/graphics_interface.c
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/graphics_interface.c
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/graphics_interface.c
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/mesh.frag.glsl b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/mesh.frag.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/mesh.frag.glsl
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/mesh.frag.glsl
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/mesh.vert.glsl b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/mesh.vert.glsl
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/mesh.vert.glsl
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/mesh.vert.glsl
diff --git a/Samples/5_Domain_Specific/simpleGLES_screen/simpleGLES_screen.cu b/Samples/8_Platform_Specific/Tegra/simpleGLES_screen/simpleGLES_screen.cu
similarity index 100%
rename from Samples/5_Domain_Specific/simpleGLES_screen/simpleGLES_screen.cu
rename to Samples/8_Platform_Specific/Tegra/simpleGLES_screen/simpleGLES_screen.cu