diff --git a/gpu/targets/apps/GKS/BoundaryJet/3rdPartyLinking.cmake b/apps/gpu/GKS/BoundaryJet/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/BoundaryJet/3rdPartyLinking.cmake rename to apps/gpu/GKS/BoundaryJet/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/BoundaryJet/BoundaryJet.cpp b/apps/gpu/GKS/BoundaryJet/BoundaryJet.cpp similarity index 100% rename from gpu/targets/apps/GKS/BoundaryJet/BoundaryJet.cpp rename to apps/gpu/GKS/BoundaryJet/BoundaryJet.cpp diff --git a/gpu/targets/apps/GKS/BoundaryJet/CMakeLists.txt b/apps/gpu/GKS/BoundaryJet/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/BoundaryJet/CMakeLists.txt rename to apps/gpu/GKS/BoundaryJet/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/BoundaryJet/CMakePackage.cmake b/apps/gpu/GKS/BoundaryJet/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/BoundaryJet/CMakePackage.cmake rename to apps/gpu/GKS/BoundaryJet/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/BoundaryJet/package.include b/apps/gpu/GKS/BoundaryJet/package.include similarity index 100% rename from gpu/targets/apps/GKS/BoundaryJet/package.include rename to apps/gpu/GKS/BoundaryJet/package.include diff --git a/gpu/targets/apps/GKS/Candle/3rdPartyLinking.cmake b/apps/gpu/GKS/Candle/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/Candle/3rdPartyLinking.cmake rename to apps/gpu/GKS/Candle/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/Candle/CMakeLists.txt b/apps/gpu/GKS/Candle/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/Candle/CMakeLists.txt rename to apps/gpu/GKS/Candle/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/Candle/CMakePackage.cmake b/apps/gpu/GKS/Candle/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/Candle/CMakePackage.cmake rename to apps/gpu/GKS/Candle/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/Candle/Candle.cpp b/apps/gpu/GKS/Candle/Candle.cpp similarity index 100% rename from gpu/targets/apps/GKS/Candle/Candle.cpp rename to apps/gpu/GKS/Candle/Candle.cpp diff --git a/gpu/targets/apps/GKS/Candle/package.include b/apps/gpu/GKS/Candle/package.include similarity index 100% rename from gpu/targets/apps/GKS/Candle/package.include rename to apps/gpu/GKS/Candle/package.include diff --git a/gpu/targets/apps/GKS/ChannelFlow/3rdPartyLinking.cmake b/apps/gpu/GKS/ChannelFlow/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlow/3rdPartyLinking.cmake rename to apps/gpu/GKS/ChannelFlow/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ChannelFlow/CMakeLists.txt b/apps/gpu/GKS/ChannelFlow/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlow/CMakeLists.txt rename to apps/gpu/GKS/ChannelFlow/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ChannelFlow/CMakePackage.cmake b/apps/gpu/GKS/ChannelFlow/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlow/CMakePackage.cmake rename to apps/gpu/GKS/ChannelFlow/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ChannelFlow/ChannelFlow.cpp b/apps/gpu/GKS/ChannelFlow/ChannelFlow.cpp similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlow/ChannelFlow.cpp rename to apps/gpu/GKS/ChannelFlow/ChannelFlow.cpp diff --git a/gpu/targets/apps/GKS/ChannelFlow/package.include b/apps/gpu/GKS/ChannelFlow/package.include similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlow/package.include rename to apps/gpu/GKS/ChannelFlow/package.include diff --git a/gpu/targets/apps/GKS/ChannelFlowObstacle/3rdPartyLinking.cmake b/apps/gpu/GKS/ChannelFlowObstacle/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlowObstacle/3rdPartyLinking.cmake rename to apps/gpu/GKS/ChannelFlowObstacle/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ChannelFlowObstacle/CMakeLists.txt b/apps/gpu/GKS/ChannelFlowObstacle/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlowObstacle/CMakeLists.txt rename to apps/gpu/GKS/ChannelFlowObstacle/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ChannelFlowObstacle/CMakePackage.cmake b/apps/gpu/GKS/ChannelFlowObstacle/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlowObstacle/CMakePackage.cmake rename to apps/gpu/GKS/ChannelFlowObstacle/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ChannelFlowObstacle/ChannelFlowObstacle.cpp b/apps/gpu/GKS/ChannelFlowObstacle/ChannelFlowObstacle.cpp similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlowObstacle/ChannelFlowObstacle.cpp rename to apps/gpu/GKS/ChannelFlowObstacle/ChannelFlowObstacle.cpp diff --git a/gpu/targets/apps/GKS/ChannelFlowObstacle/package.include b/apps/gpu/GKS/ChannelFlowObstacle/package.include similarity index 100% rename from gpu/targets/apps/GKS/ChannelFlowObstacle/package.include rename to apps/gpu/GKS/ChannelFlowObstacle/package.include diff --git a/gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/3rdPartyLinking.cmake b/apps/gpu/GKS/ConcreteHeatFluxBCTest/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/3rdPartyLinking.cmake rename to apps/gpu/GKS/ConcreteHeatFluxBCTest/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/CMakeLists.txt b/apps/gpu/GKS/ConcreteHeatFluxBCTest/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/CMakeLists.txt rename to apps/gpu/GKS/ConcreteHeatFluxBCTest/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/CMakePackage.cmake b/apps/gpu/GKS/ConcreteHeatFluxBCTest/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/CMakePackage.cmake rename to apps/gpu/GKS/ConcreteHeatFluxBCTest/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/ConcreteHeatFluxBCTest.cpp b/apps/gpu/GKS/ConcreteHeatFluxBCTest/ConcreteHeatFluxBCTest.cpp similarity index 100% rename from gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/ConcreteHeatFluxBCTest.cpp rename to apps/gpu/GKS/ConcreteHeatFluxBCTest/ConcreteHeatFluxBCTest.cpp diff --git a/gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/package.include b/apps/gpu/GKS/ConcreteHeatFluxBCTest/package.include similarity index 100% rename from gpu/targets/apps/GKS/ConcreteHeatFluxBCTest/package.include rename to apps/gpu/GKS/ConcreteHeatFluxBCTest/package.include diff --git a/gpu/targets/apps/GKS/ConfinedCombustion/3rdPartyLinking.cmake b/apps/gpu/GKS/ConfinedCombustion/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ConfinedCombustion/3rdPartyLinking.cmake rename to apps/gpu/GKS/ConfinedCombustion/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ConfinedCombustion/CMakeLists.txt b/apps/gpu/GKS/ConfinedCombustion/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ConfinedCombustion/CMakeLists.txt rename to apps/gpu/GKS/ConfinedCombustion/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ConfinedCombustion/CMakePackage.cmake b/apps/gpu/GKS/ConfinedCombustion/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ConfinedCombustion/CMakePackage.cmake rename to apps/gpu/GKS/ConfinedCombustion/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ConfinedCombustion/ConfinedCombustion.cpp b/apps/gpu/GKS/ConfinedCombustion/ConfinedCombustion.cpp similarity index 100% rename from gpu/targets/apps/GKS/ConfinedCombustion/ConfinedCombustion.cpp rename to apps/gpu/GKS/ConfinedCombustion/ConfinedCombustion.cpp diff --git a/gpu/targets/apps/GKS/ConfinedCombustion/package.include b/apps/gpu/GKS/ConfinedCombustion/package.include similarity index 100% rename from gpu/targets/apps/GKS/ConfinedCombustion/package.include rename to apps/gpu/GKS/ConfinedCombustion/package.include diff --git a/gpu/targets/apps/GKS/DrivenCavity3D/3rdPartyLinking.cmake b/apps/gpu/GKS/DrivenCavity3D/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavity3D/3rdPartyLinking.cmake rename to apps/gpu/GKS/DrivenCavity3D/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/DrivenCavity3D/CMakeLists.txt b/apps/gpu/GKS/DrivenCavity3D/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavity3D/CMakeLists.txt rename to apps/gpu/GKS/DrivenCavity3D/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/DrivenCavity3D/CMakePackage.cmake b/apps/gpu/GKS/DrivenCavity3D/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavity3D/CMakePackage.cmake rename to apps/gpu/GKS/DrivenCavity3D/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/DrivenCavity3D/DrivenCavity3D.cpp b/apps/gpu/GKS/DrivenCavity3D/DrivenCavity3D.cpp similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavity3D/DrivenCavity3D.cpp rename to apps/gpu/GKS/DrivenCavity3D/DrivenCavity3D.cpp diff --git a/gpu/targets/apps/GKS/DrivenCavity3D/package.include b/apps/gpu/GKS/DrivenCavity3D/package.include similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavity3D/package.include rename to apps/gpu/GKS/DrivenCavity3D/package.include diff --git a/gpu/targets/apps/GKS/DrivenCavityMultiGPU/3rdPartyLinking.cmake b/apps/gpu/GKS/DrivenCavityMultiGPU/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavityMultiGPU/3rdPartyLinking.cmake rename to apps/gpu/GKS/DrivenCavityMultiGPU/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/DrivenCavityMultiGPU/CMakeLists.txt b/apps/gpu/GKS/DrivenCavityMultiGPU/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavityMultiGPU/CMakeLists.txt rename to apps/gpu/GKS/DrivenCavityMultiGPU/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/DrivenCavityMultiGPU/CMakePackage.cmake b/apps/gpu/GKS/DrivenCavityMultiGPU/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavityMultiGPU/CMakePackage.cmake rename to apps/gpu/GKS/DrivenCavityMultiGPU/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/GKS/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp rename to apps/gpu/GKS/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp diff --git a/gpu/targets/apps/GKS/DrivenCavityMultiGPU/package.include b/apps/gpu/GKS/DrivenCavityMultiGPU/package.include similarity index 100% rename from gpu/targets/apps/GKS/DrivenCavityMultiGPU/package.include rename to apps/gpu/GKS/DrivenCavityMultiGPU/package.include diff --git a/gpu/targets/apps/GKS/Flame7cm/3rdPartyLinking.cmake b/apps/gpu/GKS/Flame7cm/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/Flame7cm/3rdPartyLinking.cmake rename to apps/gpu/GKS/Flame7cm/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/Flame7cm/CMakeLists.txt b/apps/gpu/GKS/Flame7cm/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/Flame7cm/CMakeLists.txt rename to apps/gpu/GKS/Flame7cm/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/Flame7cm/CMakePackage.cmake b/apps/gpu/GKS/Flame7cm/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/Flame7cm/CMakePackage.cmake rename to apps/gpu/GKS/Flame7cm/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/Flame7cm/Flame7cm.cpp b/apps/gpu/GKS/Flame7cm/Flame7cm.cpp similarity index 100% rename from gpu/targets/apps/GKS/Flame7cm/Flame7cm.cpp rename to apps/gpu/GKS/Flame7cm/Flame7cm.cpp diff --git a/gpu/targets/apps/GKS/Flame7cm/package.include b/apps/gpu/GKS/Flame7cm/package.include similarity index 100% rename from gpu/targets/apps/GKS/Flame7cm/package.include rename to apps/gpu/GKS/Flame7cm/package.include diff --git a/gpu/targets/apps/GKS/LiFuXu/3rdPartyLinking.cmake b/apps/gpu/GKS/LiFuXu/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/LiFuXu/3rdPartyLinking.cmake rename to apps/gpu/GKS/LiFuXu/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/LiFuXu/CMakeLists.txt b/apps/gpu/GKS/LiFuXu/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/LiFuXu/CMakeLists.txt rename to apps/gpu/GKS/LiFuXu/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/LiFuXu/CMakePackage.cmake b/apps/gpu/GKS/LiFuXu/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/LiFuXu/CMakePackage.cmake rename to apps/gpu/GKS/LiFuXu/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/LiFuXu/LiFuXu.cpp b/apps/gpu/GKS/LiFuXu/LiFuXu.cpp similarity index 100% rename from gpu/targets/apps/GKS/LiFuXu/LiFuXu.cpp rename to apps/gpu/GKS/LiFuXu/LiFuXu.cpp diff --git a/gpu/targets/apps/GKS/LiFuXu/package.include b/apps/gpu/GKS/LiFuXu/package.include similarity index 100% rename from gpu/targets/apps/GKS/LiFuXu/package.include rename to apps/gpu/GKS/LiFuXu/package.include diff --git a/gpu/targets/apps/GKS/MethaneFlame/3rdPartyLinking.cmake b/apps/gpu/GKS/MethaneFlame/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/MethaneFlame/3rdPartyLinking.cmake rename to apps/gpu/GKS/MethaneFlame/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/MethaneFlame/CMakeLists.txt b/apps/gpu/GKS/MethaneFlame/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/MethaneFlame/CMakeLists.txt rename to apps/gpu/GKS/MethaneFlame/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/MethaneFlame/CMakePackage.cmake b/apps/gpu/GKS/MethaneFlame/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/MethaneFlame/CMakePackage.cmake rename to apps/gpu/GKS/MethaneFlame/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/MethaneFlame/MethaneFlame.cpp b/apps/gpu/GKS/MethaneFlame/MethaneFlame.cpp similarity index 100% rename from gpu/targets/apps/GKS/MethaneFlame/MethaneFlame.cpp rename to apps/gpu/GKS/MethaneFlame/MethaneFlame.cpp diff --git a/gpu/targets/apps/GKS/MethaneFlame/package.include b/apps/gpu/GKS/MethaneFlame/package.include similarity index 100% rename from gpu/targets/apps/GKS/MethaneFlame/package.include rename to apps/gpu/GKS/MethaneFlame/package.include diff --git a/gpu/targets/apps/GKS/MultiGPU/3rdPartyLinking.cmake b/apps/gpu/GKS/MultiGPU/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU/3rdPartyLinking.cmake rename to apps/gpu/GKS/MultiGPU/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/MultiGPU/CMakeLists.txt b/apps/gpu/GKS/MultiGPU/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU/CMakeLists.txt rename to apps/gpu/GKS/MultiGPU/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/MultiGPU/CMakePackage.cmake b/apps/gpu/GKS/MultiGPU/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU/CMakePackage.cmake rename to apps/gpu/GKS/MultiGPU/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/MultiGPU/MultiGPU.cpp b/apps/gpu/GKS/MultiGPU/MultiGPU.cpp similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU/MultiGPU.cpp rename to apps/gpu/GKS/MultiGPU/MultiGPU.cpp diff --git a/gpu/targets/apps/GKS/MultiGPU/package.include b/apps/gpu/GKS/MultiGPU/package.include similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU/package.include rename to apps/gpu/GKS/MultiGPU/package.include diff --git a/gpu/targets/apps/GKS/MultiGPU_nD/3rdPartyLinking.cmake b/apps/gpu/GKS/MultiGPU_nD/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU_nD/3rdPartyLinking.cmake rename to apps/gpu/GKS/MultiGPU_nD/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/MultiGPU_nD/CMakeLists.txt b/apps/gpu/GKS/MultiGPU_nD/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU_nD/CMakeLists.txt rename to apps/gpu/GKS/MultiGPU_nD/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/MultiGPU_nD/CMakePackage.cmake b/apps/gpu/GKS/MultiGPU_nD/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU_nD/CMakePackage.cmake rename to apps/gpu/GKS/MultiGPU_nD/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/MultiGPU_nD/MultiGPU_nD.cpp b/apps/gpu/GKS/MultiGPU_nD/MultiGPU_nD.cpp similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU_nD/MultiGPU_nD.cpp rename to apps/gpu/GKS/MultiGPU_nD/MultiGPU_nD.cpp diff --git a/gpu/targets/apps/GKS/MultiGPU_nD/package.include b/apps/gpu/GKS/MultiGPU_nD/package.include similarity index 100% rename from gpu/targets/apps/GKS/MultiGPU_nD/package.include rename to apps/gpu/GKS/MultiGPU_nD/package.include diff --git a/gpu/targets/apps/GKS/PoolFire/3rdPartyLinking.cmake b/apps/gpu/GKS/PoolFire/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/PoolFire/3rdPartyLinking.cmake rename to apps/gpu/GKS/PoolFire/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/PoolFire/CMakeLists.txt b/apps/gpu/GKS/PoolFire/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/PoolFire/CMakeLists.txt rename to apps/gpu/GKS/PoolFire/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/PoolFire/CMakePackage.cmake b/apps/gpu/GKS/PoolFire/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/PoolFire/CMakePackage.cmake rename to apps/gpu/GKS/PoolFire/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/PoolFire/PoolFire.cpp b/apps/gpu/GKS/PoolFire/PoolFire.cpp similarity index 100% rename from gpu/targets/apps/GKS/PoolFire/PoolFire.cpp rename to apps/gpu/GKS/PoolFire/PoolFire.cpp diff --git a/gpu/targets/apps/GKS/PoolFire/package.include b/apps/gpu/GKS/PoolFire/package.include similarity index 100% rename from gpu/targets/apps/GKS/PoolFire/package.include rename to apps/gpu/GKS/PoolFire/package.include diff --git a/gpu/targets/apps/GKS/PropaneFlame/3rdPartyLinking.cmake b/apps/gpu/GKS/PropaneFlame/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/PropaneFlame/3rdPartyLinking.cmake rename to apps/gpu/GKS/PropaneFlame/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/PropaneFlame/CMakeLists.txt b/apps/gpu/GKS/PropaneFlame/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/PropaneFlame/CMakeLists.txt rename to apps/gpu/GKS/PropaneFlame/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/PropaneFlame/CMakePackage.cmake b/apps/gpu/GKS/PropaneFlame/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/PropaneFlame/CMakePackage.cmake rename to apps/gpu/GKS/PropaneFlame/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/PropaneFlame/PropaneFlame.cpp b/apps/gpu/GKS/PropaneFlame/PropaneFlame.cpp similarity index 100% rename from gpu/targets/apps/GKS/PropaneFlame/PropaneFlame.cpp rename to apps/gpu/GKS/PropaneFlame/PropaneFlame.cpp diff --git a/gpu/targets/apps/GKS/PropaneFlame/package.include b/apps/gpu/GKS/PropaneFlame/package.include similarity index 100% rename from gpu/targets/apps/GKS/PropaneFlame/package.include rename to apps/gpu/GKS/PropaneFlame/package.include diff --git a/gpu/targets/apps/GKS/RayleighBenardMultiGPU/3rdPartyLinking.cmake b/apps/gpu/GKS/RayleighBenardMultiGPU/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/RayleighBenardMultiGPU/3rdPartyLinking.cmake rename to apps/gpu/GKS/RayleighBenardMultiGPU/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/RayleighBenardMultiGPU/CMakeLists.txt b/apps/gpu/GKS/RayleighBenardMultiGPU/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/RayleighBenardMultiGPU/CMakeLists.txt rename to apps/gpu/GKS/RayleighBenardMultiGPU/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/RayleighBenardMultiGPU/CMakePackage.cmake b/apps/gpu/GKS/RayleighBenardMultiGPU/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/RayleighBenardMultiGPU/CMakePackage.cmake rename to apps/gpu/GKS/RayleighBenardMultiGPU/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/RayleighBenardMultiGPU/RayleighBenardMultiGPU.cpp b/apps/gpu/GKS/RayleighBenardMultiGPU/RayleighBenardMultiGPU.cpp similarity index 100% rename from gpu/targets/apps/GKS/RayleighBenardMultiGPU/RayleighBenardMultiGPU.cpp rename to apps/gpu/GKS/RayleighBenardMultiGPU/RayleighBenardMultiGPU.cpp diff --git a/gpu/targets/apps/GKS/RayleighBenardMultiGPU/package.include b/apps/gpu/GKS/RayleighBenardMultiGPU/package.include similarity index 100% rename from gpu/targets/apps/GKS/RayleighBenardMultiGPU/package.include rename to apps/gpu/GKS/RayleighBenardMultiGPU/package.include diff --git a/gpu/targets/apps/GKS/Room/3rdPartyLinking.cmake b/apps/gpu/GKS/Room/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/Room/3rdPartyLinking.cmake rename to apps/gpu/GKS/Room/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/Room/CMakeLists.txt b/apps/gpu/GKS/Room/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/Room/CMakeLists.txt rename to apps/gpu/GKS/Room/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/Room/CMakePackage.cmake b/apps/gpu/GKS/Room/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/Room/CMakePackage.cmake rename to apps/gpu/GKS/Room/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/Room/Room.cpp b/apps/gpu/GKS/Room/Room.cpp similarity index 100% rename from gpu/targets/apps/GKS/Room/Room.cpp rename to apps/gpu/GKS/Room/Room.cpp diff --git a/gpu/targets/apps/GKS/Room/package.include b/apps/gpu/GKS/Room/package.include similarity index 100% rename from gpu/targets/apps/GKS/Room/package.include rename to apps/gpu/GKS/Room/package.include diff --git a/gpu/targets/apps/GKS/RoomFire/3rdPartyLinking.cmake b/apps/gpu/GKS/RoomFire/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/RoomFire/3rdPartyLinking.cmake rename to apps/gpu/GKS/RoomFire/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/RoomFire/CMakeLists.txt b/apps/gpu/GKS/RoomFire/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/RoomFire/CMakeLists.txt rename to apps/gpu/GKS/RoomFire/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/RoomFire/CMakePackage.cmake b/apps/gpu/GKS/RoomFire/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/RoomFire/CMakePackage.cmake rename to apps/gpu/GKS/RoomFire/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/RoomFire/RoomFire.cpp b/apps/gpu/GKS/RoomFire/RoomFire.cpp similarity index 100% rename from gpu/targets/apps/GKS/RoomFire/RoomFire.cpp rename to apps/gpu/GKS/RoomFire/RoomFire.cpp diff --git a/gpu/targets/apps/GKS/RoomFire/package.include b/apps/gpu/GKS/RoomFire/package.include similarity index 100% rename from gpu/targets/apps/GKS/RoomFire/package.include rename to apps/gpu/GKS/RoomFire/package.include diff --git a/gpu/targets/apps/GKS/RoomFireExtended/3rdPartyLinking.cmake b/apps/gpu/GKS/RoomFireExtended/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/RoomFireExtended/3rdPartyLinking.cmake rename to apps/gpu/GKS/RoomFireExtended/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/RoomFireExtended/CMakeLists.txt b/apps/gpu/GKS/RoomFireExtended/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/RoomFireExtended/CMakeLists.txt rename to apps/gpu/GKS/RoomFireExtended/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/RoomFireExtended/CMakePackage.cmake b/apps/gpu/GKS/RoomFireExtended/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/RoomFireExtended/CMakePackage.cmake rename to apps/gpu/GKS/RoomFireExtended/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/RoomFireExtended/RoomFireExtended.cpp b/apps/gpu/GKS/RoomFireExtended/RoomFireExtended.cpp similarity index 100% rename from gpu/targets/apps/GKS/RoomFireExtended/RoomFireExtended.cpp rename to apps/gpu/GKS/RoomFireExtended/RoomFireExtended.cpp diff --git a/gpu/targets/apps/GKS/RoomFireExtended/package.include b/apps/gpu/GKS/RoomFireExtended/package.include similarity index 100% rename from gpu/targets/apps/GKS/RoomFireExtended/package.include rename to apps/gpu/GKS/RoomFireExtended/package.include diff --git a/gpu/targets/apps/GKS/RoomMultiGPU/3rdPartyLinking.cmake b/apps/gpu/GKS/RoomMultiGPU/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/RoomMultiGPU/3rdPartyLinking.cmake rename to apps/gpu/GKS/RoomMultiGPU/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/RoomMultiGPU/CMakeLists.txt b/apps/gpu/GKS/RoomMultiGPU/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/RoomMultiGPU/CMakeLists.txt rename to apps/gpu/GKS/RoomMultiGPU/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/RoomMultiGPU/CMakePackage.cmake b/apps/gpu/GKS/RoomMultiGPU/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/RoomMultiGPU/CMakePackage.cmake rename to apps/gpu/GKS/RoomMultiGPU/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/RoomMultiGPU/RoomMultiGPU.cpp b/apps/gpu/GKS/RoomMultiGPU/RoomMultiGPU.cpp similarity index 100% rename from gpu/targets/apps/GKS/RoomMultiGPU/RoomMultiGPU.cpp rename to apps/gpu/GKS/RoomMultiGPU/RoomMultiGPU.cpp diff --git a/gpu/targets/apps/GKS/RoomMultiGPU/package.include b/apps/gpu/GKS/RoomMultiGPU/package.include similarity index 100% rename from gpu/targets/apps/GKS/RoomMultiGPU/package.include rename to apps/gpu/GKS/RoomMultiGPU/package.include diff --git a/gpu/targets/apps/GKS/SalinasVazquez/3rdPartyLinking.cmake b/apps/gpu/GKS/SalinasVazquez/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/SalinasVazquez/3rdPartyLinking.cmake rename to apps/gpu/GKS/SalinasVazquez/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/SalinasVazquez/CMakeLists.txt b/apps/gpu/GKS/SalinasVazquez/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/SalinasVazquez/CMakeLists.txt rename to apps/gpu/GKS/SalinasVazquez/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/SalinasVazquez/CMakePackage.cmake b/apps/gpu/GKS/SalinasVazquez/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/SalinasVazquez/CMakePackage.cmake rename to apps/gpu/GKS/SalinasVazquez/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/SalinasVazquez/SalinasVazquez.cpp b/apps/gpu/GKS/SalinasVazquez/SalinasVazquez.cpp similarity index 100% rename from gpu/targets/apps/GKS/SalinasVazquez/SalinasVazquez.cpp rename to apps/gpu/GKS/SalinasVazquez/SalinasVazquez.cpp diff --git a/gpu/targets/apps/GKS/SalinasVazquez/package.include b/apps/gpu/GKS/SalinasVazquez/package.include similarity index 100% rename from gpu/targets/apps/GKS/SalinasVazquez/package.include rename to apps/gpu/GKS/SalinasVazquez/package.include diff --git a/gpu/targets/apps/GKS/SandiaFlame_1m/3rdPartyLinking.cmake b/apps/gpu/GKS/SandiaFlame_1m/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/SandiaFlame_1m/3rdPartyLinking.cmake rename to apps/gpu/GKS/SandiaFlame_1m/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/SandiaFlame_1m/CMakeLists.txt b/apps/gpu/GKS/SandiaFlame_1m/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/SandiaFlame_1m/CMakeLists.txt rename to apps/gpu/GKS/SandiaFlame_1m/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/SandiaFlame_1m/CMakePackage.cmake b/apps/gpu/GKS/SandiaFlame_1m/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/SandiaFlame_1m/CMakePackage.cmake rename to apps/gpu/GKS/SandiaFlame_1m/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/SandiaFlame_1m/SandiaFlame_1m.cpp b/apps/gpu/GKS/SandiaFlame_1m/SandiaFlame_1m.cpp similarity index 100% rename from gpu/targets/apps/GKS/SandiaFlame_1m/SandiaFlame_1m.cpp rename to apps/gpu/GKS/SandiaFlame_1m/SandiaFlame_1m.cpp diff --git a/gpu/targets/apps/GKS/SandiaFlame_1m/package.include b/apps/gpu/GKS/SandiaFlame_1m/package.include similarity index 100% rename from gpu/targets/apps/GKS/SandiaFlame_1m/package.include rename to apps/gpu/GKS/SandiaFlame_1m/package.include diff --git a/gpu/targets/apps/GKS/ShearWave/3rdPartyLinking.cmake b/apps/gpu/GKS/ShearWave/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ShearWave/3rdPartyLinking.cmake rename to apps/gpu/GKS/ShearWave/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ShearWave/CMakeLists.txt b/apps/gpu/GKS/ShearWave/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ShearWave/CMakeLists.txt rename to apps/gpu/GKS/ShearWave/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ShearWave/CMakePackage.cmake b/apps/gpu/GKS/ShearWave/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ShearWave/CMakePackage.cmake rename to apps/gpu/GKS/ShearWave/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ShearWave/ShearWave.cpp b/apps/gpu/GKS/ShearWave/ShearWave.cpp similarity index 100% rename from gpu/targets/apps/GKS/ShearWave/ShearWave.cpp rename to apps/gpu/GKS/ShearWave/ShearWave.cpp diff --git a/gpu/targets/apps/GKS/ShearWave/package.include b/apps/gpu/GKS/ShearWave/package.include similarity index 100% rename from gpu/targets/apps/GKS/ShearWave/package.include rename to apps/gpu/GKS/ShearWave/package.include diff --git a/gpu/targets/apps/GKS/SingleGPU/3rdPartyLinking.cmake b/apps/gpu/GKS/SingleGPU/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/SingleGPU/3rdPartyLinking.cmake rename to apps/gpu/GKS/SingleGPU/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/SingleGPU/CMakeLists.txt b/apps/gpu/GKS/SingleGPU/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/SingleGPU/CMakeLists.txt rename to apps/gpu/GKS/SingleGPU/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/SingleGPU/CMakePackage.cmake b/apps/gpu/GKS/SingleGPU/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/SingleGPU/CMakePackage.cmake rename to apps/gpu/GKS/SingleGPU/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/SingleGPU/SingleGPU.cpp b/apps/gpu/GKS/SingleGPU/SingleGPU.cpp similarity index 100% rename from gpu/targets/apps/GKS/SingleGPU/SingleGPU.cpp rename to apps/gpu/GKS/SingleGPU/SingleGPU.cpp diff --git a/gpu/targets/apps/GKS/SingleGPU/package.include b/apps/gpu/GKS/SingleGPU/package.include similarity index 100% rename from gpu/targets/apps/GKS/SingleGPU/package.include rename to apps/gpu/GKS/SingleGPU/package.include diff --git a/gpu/targets/apps/GKS/TaylorGreen3D/3rdPartyLinking.cmake b/apps/gpu/GKS/TaylorGreen3D/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/TaylorGreen3D/3rdPartyLinking.cmake rename to apps/gpu/GKS/TaylorGreen3D/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/TaylorGreen3D/CMakeLists.txt b/apps/gpu/GKS/TaylorGreen3D/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/TaylorGreen3D/CMakeLists.txt rename to apps/gpu/GKS/TaylorGreen3D/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/TaylorGreen3D/CMakePackage.cmake b/apps/gpu/GKS/TaylorGreen3D/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/TaylorGreen3D/CMakePackage.cmake rename to apps/gpu/GKS/TaylorGreen3D/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/TaylorGreen3D/TaylorGreen3D.cpp b/apps/gpu/GKS/TaylorGreen3D/TaylorGreen3D.cpp similarity index 100% rename from gpu/targets/apps/GKS/TaylorGreen3D/TaylorGreen3D.cpp rename to apps/gpu/GKS/TaylorGreen3D/TaylorGreen3D.cpp diff --git a/gpu/targets/apps/GKS/TaylorGreen3D/package.include b/apps/gpu/GKS/TaylorGreen3D/package.include similarity index 100% rename from gpu/targets/apps/GKS/TaylorGreen3D/package.include rename to apps/gpu/GKS/TaylorGreen3D/package.include diff --git a/gpu/targets/apps/GKS/ThermalCavity/3rdPartyLinking.cmake b/apps/gpu/GKS/ThermalCavity/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavity/3rdPartyLinking.cmake rename to apps/gpu/GKS/ThermalCavity/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ThermalCavity/CMakeLists.txt b/apps/gpu/GKS/ThermalCavity/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavity/CMakeLists.txt rename to apps/gpu/GKS/ThermalCavity/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ThermalCavity/CMakePackage.cmake b/apps/gpu/GKS/ThermalCavity/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavity/CMakePackage.cmake rename to apps/gpu/GKS/ThermalCavity/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ThermalCavity/ThermalCavity.cpp b/apps/gpu/GKS/ThermalCavity/ThermalCavity.cpp similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavity/ThermalCavity.cpp rename to apps/gpu/GKS/ThermalCavity/ThermalCavity.cpp diff --git a/gpu/targets/apps/GKS/ThermalCavity/package.include b/apps/gpu/GKS/ThermalCavity/package.include similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavity/package.include rename to apps/gpu/GKS/ThermalCavity/package.include diff --git a/gpu/targets/apps/GKS/ThermalCavityMultiGPU/3rdPartyLinking.cmake b/apps/gpu/GKS/ThermalCavityMultiGPU/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavityMultiGPU/3rdPartyLinking.cmake rename to apps/gpu/GKS/ThermalCavityMultiGPU/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/ThermalCavityMultiGPU/CMakeLists.txt b/apps/gpu/GKS/ThermalCavityMultiGPU/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavityMultiGPU/CMakeLists.txt rename to apps/gpu/GKS/ThermalCavityMultiGPU/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/ThermalCavityMultiGPU/CMakePackage.cmake b/apps/gpu/GKS/ThermalCavityMultiGPU/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavityMultiGPU/CMakePackage.cmake rename to apps/gpu/GKS/ThermalCavityMultiGPU/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/ThermalCavityMultiGPU/ThermalCavityMultiGPU.cpp b/apps/gpu/GKS/ThermalCavityMultiGPU/ThermalCavityMultiGPU.cpp similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavityMultiGPU/ThermalCavityMultiGPU.cpp rename to apps/gpu/GKS/ThermalCavityMultiGPU/ThermalCavityMultiGPU.cpp diff --git a/gpu/targets/apps/GKS/ThermalCavityMultiGPU/package.include b/apps/gpu/GKS/ThermalCavityMultiGPU/package.include similarity index 100% rename from gpu/targets/apps/GKS/ThermalCavityMultiGPU/package.include rename to apps/gpu/GKS/ThermalCavityMultiGPU/package.include diff --git a/gpu/targets/apps/GKS/gksTest/3rdPartyLinking.cmake b/apps/gpu/GKS/gksTest/3rdPartyLinking.cmake similarity index 100% rename from gpu/targets/apps/GKS/gksTest/3rdPartyLinking.cmake rename to apps/gpu/GKS/gksTest/3rdPartyLinking.cmake diff --git a/gpu/targets/apps/GKS/gksTest/CMakeLists.txt b/apps/gpu/GKS/gksTest/CMakeLists.txt similarity index 100% rename from gpu/targets/apps/GKS/gksTest/CMakeLists.txt rename to apps/gpu/GKS/gksTest/CMakeLists.txt diff --git a/gpu/targets/apps/GKS/gksTest/CMakePackage.cmake b/apps/gpu/GKS/gksTest/CMakePackage.cmake similarity index 100% rename from gpu/targets/apps/GKS/gksTest/CMakePackage.cmake rename to apps/gpu/GKS/gksTest/CMakePackage.cmake diff --git a/gpu/targets/apps/GKS/gksTest/main.cpp b/apps/gpu/GKS/gksTest/main.cpp similarity index 100% rename from gpu/targets/apps/GKS/gksTest/main.cpp rename to apps/gpu/GKS/gksTest/main.cpp diff --git a/gpu/targets/apps/GKS/gksTest/package.include b/apps/gpu/GKS/gksTest/package.include similarity index 100% rename from gpu/targets/apps/GKS/gksTest/package.include rename to apps/gpu/GKS/gksTest/package.include