diff --git a/gpu/targets/apps/LBM/Basel/3rdPartyLinking.cmake b/apps/gpu/LBM/Basel/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/3rdPartyLinking.cmake
rename to apps/gpu/LBM/Basel/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/Basel/CMakeLists.txt b/apps/gpu/LBM/Basel/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/CMakeLists.txt
rename to apps/gpu/LBM/Basel/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/Basel/CMakePackage.cmake b/apps/gpu/LBM/Basel/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/CMakePackage.cmake
rename to apps/gpu/LBM/Basel/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/Basel/main.cpp b/apps/gpu/LBM/Basel/main.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/main.cpp
rename to apps/gpu/LBM/Basel/main.cpp
diff --git a/gpu/targets/apps/LBM/Basel/package.include b/apps/gpu/LBM/Basel/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/package.include
rename to apps/gpu/LBM/Basel/package.include
diff --git a/gpu/targets/apps/LBM/Basel/resources/Junctions.txt b/apps/gpu/LBM/Basel/resources/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/Junctions.txt
rename to apps/gpu/LBM/Basel/resources/Junctions.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/Sinks.txt b/apps/gpu/LBM/Basel/resources/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/Sinks.txt
rename to apps/gpu/LBM/Basel/resources/Sinks.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/Sources.txt b/apps/gpu/LBM/Basel/resources/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/Sources.txt
rename to apps/gpu/LBM/Basel/resources/Sources.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/Streets.txt b/apps/gpu/LBM/Basel/resources/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/Streets.txt
rename to apps/gpu/LBM/Basel/resources/Streets.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreets/Junctions.txt b/apps/gpu/LBM/Basel/resources/allStreets/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreets/Junctions.txt
rename to apps/gpu/LBM/Basel/resources/allStreets/Junctions.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreets/Sinks.txt b/apps/gpu/LBM/Basel/resources/allStreets/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreets/Sinks.txt
rename to apps/gpu/LBM/Basel/resources/allStreets/Sinks.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreets/Sources.txt b/apps/gpu/LBM/Basel/resources/allStreets/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreets/Sources.txt
rename to apps/gpu/LBM/Basel/resources/allStreets/Sources.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreets/Streets.txt b/apps/gpu/LBM/Basel/resources/allStreets/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreets/Streets.txt
rename to apps/gpu/LBM/Basel/resources/allStreets/Streets.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Junctions.txt b/apps/gpu/LBM/Basel/resources/allStreetsDouble/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Junctions.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsDouble/Junctions.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Sinks.txt b/apps/gpu/LBM/Basel/resources/allStreetsDouble/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Sinks.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsDouble/Sinks.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Sources.txt b/apps/gpu/LBM/Basel/resources/allStreetsDouble/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Sources.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsDouble/Sources.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Streets.txt b/apps/gpu/LBM/Basel/resources/allStreetsDouble/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsDouble/Streets.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsDouble/Streets.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Junctions.txt b/apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Junctions.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Junctions.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Sinks.txt b/apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Sinks.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Sinks.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Sources.txt b/apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Sources.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Sources.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Streets.txt b/apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsOneClosed/Streets.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsOneClosed/Streets.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Junctions.txt b/apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Junctions.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Junctions.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Sinks.txt b/apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Sinks.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Sinks.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Sources.txt b/apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Sources.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Sources.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Streets.txt b/apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/allStreetsQuadruple/Streets.txt
rename to apps/gpu/LBM/Basel/resources/allStreetsQuadruple/Streets.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/fourStreets/Junctions.txt b/apps/gpu/LBM/Basel/resources/fourStreets/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/fourStreets/Junctions.txt
rename to apps/gpu/LBM/Basel/resources/fourStreets/Junctions.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/fourStreets/Sinks.txt b/apps/gpu/LBM/Basel/resources/fourStreets/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/fourStreets/Sinks.txt
rename to apps/gpu/LBM/Basel/resources/fourStreets/Sinks.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/fourStreets/Sources.txt b/apps/gpu/LBM/Basel/resources/fourStreets/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/fourStreets/Sources.txt
rename to apps/gpu/LBM/Basel/resources/fourStreets/Sources.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/fourStreets/Streets.txt b/apps/gpu/LBM/Basel/resources/fourStreets/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/fourStreets/Streets.txt
rename to apps/gpu/LBM/Basel/resources/fourStreets/Streets.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions1.txt b/apps/gpu/LBM/Basel/resources/testStreets/Junctions1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions1.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Junctions1.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions2.txt b/apps/gpu/LBM/Basel/resources/testStreets/Junctions2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions2.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Junctions2.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions3.txt b/apps/gpu/LBM/Basel/resources/testStreets/Junctions3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions3.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Junctions3.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions4.txt b/apps/gpu/LBM/Basel/resources/testStreets/Junctions4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions4.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Junctions4.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions5.txt b/apps/gpu/LBM/Basel/resources/testStreets/Junctions5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions5.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Junctions5.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions6.txt b/apps/gpu/LBM/Basel/resources/testStreets/Junctions6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Junctions6.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Junctions6.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks1.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sinks1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks1.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sinks1.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks2.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sinks2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks2.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sinks2.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks3.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sinks3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks3.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sinks3.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks4.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sinks4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks4.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sinks4.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks5.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sinks5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks5.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sinks5.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks6.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sinks6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sinks6.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sinks6.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sources1.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sources1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sources1.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sources1.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sources2.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sources2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sources2.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sources2.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sources3.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sources3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sources3.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sources3.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sources4.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sources4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sources4.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sources4.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sources5.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sources5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sources5.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sources5.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Sources6.txt b/apps/gpu/LBM/Basel/resources/testStreets/Sources6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Sources6.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Sources6.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Streets1.txt b/apps/gpu/LBM/Basel/resources/testStreets/Streets1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Streets1.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Streets1.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Streets2.txt b/apps/gpu/LBM/Basel/resources/testStreets/Streets2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Streets2.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Streets2.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Streets3.txt b/apps/gpu/LBM/Basel/resources/testStreets/Streets3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Streets3.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Streets3.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Streets4.txt b/apps/gpu/LBM/Basel/resources/testStreets/Streets4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Streets4.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Streets4.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Streets5.txt b/apps/gpu/LBM/Basel/resources/testStreets/Streets5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Streets5.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Streets5.txt
diff --git a/gpu/targets/apps/LBM/Basel/resources/testStreets/Streets6.txt b/apps/gpu/LBM/Basel/resources/testStreets/Streets6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/Basel/resources/testStreets/Streets6.txt
rename to apps/gpu/LBM/Basel/resources/testStreets/Streets6.txt
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/3rdPartyLinking.cmake b/apps/gpu/LBM/BaselMultiGPU/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/3rdPartyLinking.cmake
rename to apps/gpu/LBM/BaselMultiGPU/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/CMakeLists.txt b/apps/gpu/LBM/BaselMultiGPU/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/CMakeLists.txt
rename to apps/gpu/LBM/BaselMultiGPU/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/CMakePackage.cmake b/apps/gpu/LBM/BaselMultiGPU/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/CMakePackage.cmake
rename to apps/gpu/LBM/BaselMultiGPU/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/main.cpp b/apps/gpu/LBM/BaselMultiGPU/main.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/main.cpp
rename to apps/gpu/LBM/BaselMultiGPU/main.cpp
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/package.include b/apps/gpu/LBM/BaselMultiGPU/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/package.include
rename to apps/gpu/LBM/BaselMultiGPU/package.include
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/resources/ExampleStreets.txt b/apps/gpu/LBM/BaselMultiGPU/resources/ExampleStreets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/resources/ExampleStreets.txt
rename to apps/gpu/LBM/BaselMultiGPU/resources/ExampleStreets.txt
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/resources/Junctions.txt b/apps/gpu/LBM/BaselMultiGPU/resources/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/resources/Junctions.txt
rename to apps/gpu/LBM/BaselMultiGPU/resources/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/resources/Sinks.txt b/apps/gpu/LBM/BaselMultiGPU/resources/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/resources/Sinks.txt
rename to apps/gpu/LBM/BaselMultiGPU/resources/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselMultiGPU/resources/Sources.txt b/apps/gpu/LBM/BaselMultiGPU/resources/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselMultiGPU/resources/Sources.txt
rename to apps/gpu/LBM/BaselMultiGPU/resources/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/3rdPartyLinking.cmake b/apps/gpu/LBM/BaselNU/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/3rdPartyLinking.cmake
rename to apps/gpu/LBM/BaselNU/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/BaselNU/CMakeLists.txt b/apps/gpu/LBM/BaselNU/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/CMakeLists.txt
rename to apps/gpu/LBM/BaselNU/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/CMakePackage.cmake b/apps/gpu/LBM/BaselNU/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/CMakePackage.cmake
rename to apps/gpu/LBM/BaselNU/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/BaselNU/main.cpp b/apps/gpu/LBM/BaselNU/main.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/main.cpp
rename to apps/gpu/LBM/BaselNU/main.cpp
diff --git a/gpu/targets/apps/LBM/BaselNU/package.include b/apps/gpu/LBM/BaselNU/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/package.include
rename to apps/gpu/LBM/BaselNU/package.include
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/Junctions.txt b/apps/gpu/LBM/BaselNU/resources/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/Junctions.txt
rename to apps/gpu/LBM/BaselNU/resources/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/Sinks.txt b/apps/gpu/LBM/BaselNU/resources/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/Sinks.txt
rename to apps/gpu/LBM/BaselNU/resources/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/Sources.txt b/apps/gpu/LBM/BaselNU/resources/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/Sources.txt
rename to apps/gpu/LBM/BaselNU/resources/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/Streets.txt b/apps/gpu/LBM/BaselNU/resources/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/Streets.txt
rename to apps/gpu/LBM/BaselNU/resources/Streets.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreets/Junctions.txt b/apps/gpu/LBM/BaselNU/resources/allStreets/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreets/Junctions.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreets/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreets/Sinks.txt b/apps/gpu/LBM/BaselNU/resources/allStreets/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreets/Sinks.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreets/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreets/Sources.txt b/apps/gpu/LBM/BaselNU/resources/allStreets/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreets/Sources.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreets/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreets/Streets.txt b/apps/gpu/LBM/BaselNU/resources/allStreets/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreets/Streets.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreets/Streets.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Junctions.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Junctions.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Sinks.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Sinks.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Sources.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Sources.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Streets.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsDouble/Streets.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsDouble/Streets.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Junctions.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Junctions.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Sinks.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Sinks.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Sources.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Sources.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Streets.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsOneClosed/Streets.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsOneClosed/Streets.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Junctions.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Junctions.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Sinks.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Sinks.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Sources.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Sources.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Streets.txt b/apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/allStreetsQuadruple/Streets.txt
rename to apps/gpu/LBM/BaselNU/resources/allStreetsQuadruple/Streets.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Junctions.txt b/apps/gpu/LBM/BaselNU/resources/fourStreets/Junctions.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Junctions.txt
rename to apps/gpu/LBM/BaselNU/resources/fourStreets/Junctions.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Sinks.txt b/apps/gpu/LBM/BaselNU/resources/fourStreets/Sinks.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Sinks.txt
rename to apps/gpu/LBM/BaselNU/resources/fourStreets/Sinks.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Sources.txt b/apps/gpu/LBM/BaselNU/resources/fourStreets/Sources.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Sources.txt
rename to apps/gpu/LBM/BaselNU/resources/fourStreets/Sources.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Streets.txt b/apps/gpu/LBM/BaselNU/resources/fourStreets/Streets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/fourStreets/Streets.txt
rename to apps/gpu/LBM/BaselNU/resources/fourStreets/Streets.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions1.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Junctions1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions1.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Junctions1.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions2.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Junctions2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions2.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Junctions2.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions3.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Junctions3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions3.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Junctions3.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions4.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Junctions4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions4.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Junctions4.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions5.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Junctions5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions5.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Junctions5.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions6.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Junctions6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Junctions6.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Junctions6.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks1.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sinks1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks1.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sinks1.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks2.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sinks2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks2.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sinks2.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks3.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sinks3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks3.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sinks3.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks4.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sinks4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks4.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sinks4.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks5.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sinks5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks5.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sinks5.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks6.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sinks6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sinks6.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sinks6.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources1.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sources1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources1.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sources1.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources2.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sources2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources2.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sources2.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources3.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sources3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources3.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sources3.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources4.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sources4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources4.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sources4.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources5.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sources5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources5.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sources5.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources6.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Sources6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Sources6.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Sources6.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets1.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Streets1.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets1.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Streets1.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets2.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Streets2.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets2.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Streets2.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets3.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Streets3.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets3.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Streets3.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets4.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Streets4.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets4.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Streets4.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets5.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Streets5.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets5.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Streets5.txt
diff --git a/gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets6.txt b/apps/gpu/LBM/BaselNU/resources/testStreets/Streets6.txt
similarity index 100%
rename from gpu/targets/apps/LBM/BaselNU/resources/testStreets/Streets6.txt
rename to apps/gpu/LBM/BaselNU/resources/testStreets/Streets6.txt
diff --git a/gpu/targets/apps/LBM/DrivenCavity/3rdPartyLinking.cmake b/apps/gpu/LBM/DrivenCavity/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/DrivenCavity/3rdPartyLinking.cmake
rename to apps/gpu/LBM/DrivenCavity/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/DrivenCavity/CMakeLists.txt b/apps/gpu/LBM/DrivenCavity/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/DrivenCavity/CMakeLists.txt
rename to apps/gpu/LBM/DrivenCavity/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/DrivenCavity/CMakePackage.cmake b/apps/gpu/LBM/DrivenCavity/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/DrivenCavity/CMakePackage.cmake
rename to apps/gpu/LBM/DrivenCavity/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/DrivenCavity/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/DrivenCavity/DrivenCavity.cpp
rename to apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
diff --git a/gpu/targets/apps/LBM/DrivenCavity/configDrivenCavity.txt b/apps/gpu/LBM/DrivenCavity/configDrivenCavity.txt
similarity index 100%
rename from gpu/targets/apps/LBM/DrivenCavity/configDrivenCavity.txt
rename to apps/gpu/LBM/DrivenCavity/configDrivenCavity.txt
diff --git a/gpu/targets/apps/LBM/DrivenCavity/package.include b/apps/gpu/LBM/DrivenCavity/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/DrivenCavity/package.include
rename to apps/gpu/LBM/DrivenCavity/package.include
diff --git a/gpu/targets/apps/LBM/TGV_3D/3rdPartyLinking.cmake b/apps/gpu/LBM/TGV_3D/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D/3rdPartyLinking.cmake
rename to apps/gpu/LBM/TGV_3D/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/TGV_3D/CMakeLists.txt b/apps/gpu/LBM/TGV_3D/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D/CMakeLists.txt
rename to apps/gpu/LBM/TGV_3D/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/TGV_3D/CMakePackage.cmake b/apps/gpu/LBM/TGV_3D/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D/CMakePackage.cmake
rename to apps/gpu/LBM/TGV_3D/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/TGV_3D/TGV_3D.cpp b/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D/TGV_3D.cpp
rename to apps/gpu/LBM/TGV_3D/TGV_3D.cpp
diff --git a/gpu/targets/apps/LBM/TGV_3D/config.txt b/apps/gpu/LBM/TGV_3D/config.txt
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D/config.txt
rename to apps/gpu/LBM/TGV_3D/config.txt
diff --git a/gpu/targets/apps/LBM/TGV_3D/package.include b/apps/gpu/LBM/TGV_3D/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D/package.include
rename to apps/gpu/LBM/TGV_3D/package.include
diff --git a/gpu/targets/apps/LBM/TGV_3D_MultiGPU/3rdPartyLinking.cmake b/apps/gpu/LBM/TGV_3D_MultiGPU/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D_MultiGPU/3rdPartyLinking.cmake
rename to apps/gpu/LBM/TGV_3D_MultiGPU/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/TGV_3D_MultiGPU/CMakeLists.txt b/apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D_MultiGPU/CMakeLists.txt
rename to apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/TGV_3D_MultiGPU/CMakePackage.cmake b/apps/gpu/LBM/TGV_3D_MultiGPU/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D_MultiGPU/CMakePackage.cmake
rename to apps/gpu/LBM/TGV_3D_MultiGPU/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp b/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
rename to apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
diff --git a/gpu/targets/apps/LBM/TGV_3D_MultiGPU/config.txt b/apps/gpu/LBM/TGV_3D_MultiGPU/config.txt
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D_MultiGPU/config.txt
rename to apps/gpu/LBM/TGV_3D_MultiGPU/config.txt
diff --git a/gpu/targets/apps/LBM/TGV_3D_MultiGPU/package.include b/apps/gpu/LBM/TGV_3D_MultiGPU/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/TGV_3D_MultiGPU/package.include
rename to apps/gpu/LBM/TGV_3D_MultiGPU/package.include
diff --git a/gpu/targets/apps/LBM/TrafficTest/3rdPartyLinking.cmake b/apps/gpu/LBM/TrafficTest/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/3rdPartyLinking.cmake
rename to apps/gpu/LBM/TrafficTest/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/TrafficTest/CMakeLists.txt b/apps/gpu/LBM/TrafficTest/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/CMakeLists.txt
rename to apps/gpu/LBM/TrafficTest/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/TrafficTest/CMakePackage.cmake b/apps/gpu/LBM/TrafficTest/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/CMakePackage.cmake
rename to apps/gpu/LBM/TrafficTest/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/TrafficTest/Traffic_Main.cpp b/apps/gpu/LBM/TrafficTest/Traffic_Main.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/Traffic_Main.cpp
rename to apps/gpu/LBM/TrafficTest/Traffic_Main.cpp
diff --git a/gpu/targets/apps/LBM/TrafficTest/a.exp b/apps/gpu/LBM/TrafficTest/a.exp
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/a.exp
rename to apps/gpu/LBM/TrafficTest/a.exp
diff --git a/gpu/targets/apps/LBM/TrafficTest/package.include b/apps/gpu/LBM/TrafficTest/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/package.include
rename to apps/gpu/LBM/TrafficTest/package.include
diff --git a/gpu/targets/apps/LBM/TrafficTest/resources/ExampleStreets.txt b/apps/gpu/LBM/TrafficTest/resources/ExampleStreets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/resources/ExampleStreets.txt
rename to apps/gpu/LBM/TrafficTest/resources/ExampleStreets.txt
diff --git a/gpu/targets/apps/LBM/TrafficTest/resources/FlatGround.stl b/apps/gpu/LBM/TrafficTest/resources/FlatGround.stl
similarity index 100%
rename from gpu/targets/apps/LBM/TrafficTest/resources/FlatGround.stl
rename to apps/gpu/LBM/TrafficTest/resources/FlatGround.stl
diff --git a/gpu/targets/apps/LBM/gridGeneratorTest/3rdPartyLinking.cmake b/apps/gpu/LBM/gridGeneratorTest/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/gridGeneratorTest/3rdPartyLinking.cmake
rename to apps/gpu/LBM/gridGeneratorTest/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/gridGeneratorTest/CMakeLists.txt b/apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/gridGeneratorTest/CMakeLists.txt
rename to apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/gridGeneratorTest/CMakePackage.cmake b/apps/gpu/LBM/gridGeneratorTest/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/gridGeneratorTest/CMakePackage.cmake
rename to apps/gpu/LBM/gridGeneratorTest/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/gridGeneratorTest/config.txt b/apps/gpu/LBM/gridGeneratorTest/config.txt
similarity index 100%
rename from gpu/targets/apps/LBM/gridGeneratorTest/config.txt
rename to apps/gpu/LBM/gridGeneratorTest/config.txt
diff --git a/gpu/targets/apps/LBM/gridGeneratorTest/gridGeneratorTest.cpp b/apps/gpu/LBM/gridGeneratorTest/gridGeneratorTest.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/gridGeneratorTest/gridGeneratorTest.cpp
rename to apps/gpu/LBM/gridGeneratorTest/gridGeneratorTest.cpp
diff --git a/gpu/targets/apps/LBM/gridGeneratorTest/package.include b/apps/gpu/LBM/gridGeneratorTest/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/gridGeneratorTest/package.include
rename to apps/gpu/LBM/gridGeneratorTest/package.include
diff --git a/gpu/targets/apps/LBM/lbmTest/3rdPartyLinking.cmake b/apps/gpu/LBM/lbmTest/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/lbmTest/3rdPartyLinking.cmake
rename to apps/gpu/LBM/lbmTest/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/lbmTest/CMakeLists.txt b/apps/gpu/LBM/lbmTest/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/lbmTest/CMakeLists.txt
rename to apps/gpu/LBM/lbmTest/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/lbmTest/CMakePackage.cmake b/apps/gpu/LBM/lbmTest/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/lbmTest/CMakePackage.cmake
rename to apps/gpu/LBM/lbmTest/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/lbmTest/main.cpp b/apps/gpu/LBM/lbmTest/main.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/lbmTest/main.cpp
rename to apps/gpu/LBM/lbmTest/main.cpp
diff --git a/gpu/targets/apps/LBM/lbmTest/package.include b/apps/gpu/LBM/lbmTest/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/lbmTest/package.include
rename to apps/gpu/LBM/lbmTest/package.include
diff --git a/gpu/targets/apps/LBM/metisTest/3rdPartyLinking.cmake b/apps/gpu/LBM/metisTest/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/metisTest/3rdPartyLinking.cmake
rename to apps/gpu/LBM/metisTest/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/metisTest/CMakeLists.txt b/apps/gpu/LBM/metisTest/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/metisTest/CMakeLists.txt
rename to apps/gpu/LBM/metisTest/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/metisTest/CMakePackage.cmake b/apps/gpu/LBM/metisTest/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/metisTest/CMakePackage.cmake
rename to apps/gpu/LBM/metisTest/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/metisTest/main.cpp b/apps/gpu/LBM/metisTest/main.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/metisTest/main.cpp
rename to apps/gpu/LBM/metisTest/main.cpp
diff --git a/gpu/targets/apps/LBM/metisTest/package.include b/apps/gpu/LBM/metisTest/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/metisTest/package.include
rename to apps/gpu/LBM/metisTest/package.include
diff --git a/gpu/targets/apps/LBM/streetTest/3rdPartyLinking.cmake b/apps/gpu/LBM/streetTest/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/3rdPartyLinking.cmake
rename to apps/gpu/LBM/streetTest/3rdPartyLinking.cmake
diff --git a/gpu/targets/apps/LBM/streetTest/CMakeLists.txt b/apps/gpu/LBM/streetTest/CMakeLists.txt
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/CMakeLists.txt
rename to apps/gpu/LBM/streetTest/CMakeLists.txt
diff --git a/gpu/targets/apps/LBM/streetTest/CMakePackage.cmake b/apps/gpu/LBM/streetTest/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/CMakePackage.cmake
rename to apps/gpu/LBM/streetTest/CMakePackage.cmake
diff --git a/gpu/targets/apps/LBM/streetTest/package.include b/apps/gpu/LBM/streetTest/package.include
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/package.include
rename to apps/gpu/LBM/streetTest/package.include
diff --git a/gpu/targets/apps/LBM/streetTest/resources/ExampleStreets.txt b/apps/gpu/LBM/streetTest/resources/ExampleStreets.txt
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/resources/ExampleStreets.txt
rename to apps/gpu/LBM/streetTest/resources/ExampleStreets.txt
diff --git a/gpu/targets/apps/LBM/streetTest/resources/FlatGround.stl b/apps/gpu/LBM/streetTest/resources/FlatGround.stl
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/resources/FlatGround.stl
rename to apps/gpu/LBM/streetTest/resources/FlatGround.stl
diff --git a/gpu/targets/apps/LBM/streetTest/streetTest.cpp b/apps/gpu/LBM/streetTest/streetTest.cpp
similarity index 100%
rename from gpu/targets/apps/LBM/streetTest/streetTest.cpp
rename to apps/gpu/LBM/streetTest/streetTest.cpp
diff --git a/gpu.cmake b/gpu.cmake
index 7bbd0186b27ca174e08862d91439b23b245a564a..0370b3f19189843331e411f4881e141dff887455 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -142,7 +142,7 @@ IF (VF.BUILD_VF_GPU)
     #add_subdirectory(targets/apps/LBM/BaselNU)
     #add_subdirectory(targets/apps/LBM/BaselMultiGPU)
 
-    add_subdirectory(gpu/targets/apps/LBM/DrivenCavity)
+    add_subdirectory(apps/gpu/LBM/DrivenCavity)
     #add_subdirectory(targets/apps/LBM/gridGeneratorTest)
     #add_subdirectory(targets/apps/LBM/TGV_3D)
     #add_subdirectory(targets/apps/LBM/TGV_3D_MultiGPU)