diff --git a/gpu/targets/tests/NumericalTestPostProcessing/3rdPartyLinking.cmake b/apps/gpu/tests/NumericalTestPostProcessing/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/3rdPartyLinking.cmake
rename to apps/gpu/tests/NumericalTestPostProcessing/3rdPartyLinking.cmake
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/CMakeLists.txt b/apps/gpu/tests/NumericalTestPostProcessing/CMakeLists.txt
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/CMakeLists.txt
rename to apps/gpu/tests/NumericalTestPostProcessing/CMakeLists.txt
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/CMakePackage.cmake b/apps/gpu/tests/NumericalTestPostProcessing/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/CMakePackage.cmake
rename to apps/gpu/tests/NumericalTestPostProcessing/CMakePackage.cmake
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/BasicSimulation.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/BasicSimulation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/BasicSimulation.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/BasicSimulation.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/ShearWaveLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/ShearWaveLogFileDataAssistantStrategy.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/ShearWave/LogFileDataAssistantStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/TaylorGreenVortexUxLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/TaylorGreenVortexUxLogFileDataAssistantStrategy.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUx/LogFileDataAssistantStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/TaylorGreenVortexUzLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.h b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/TaylorGreenVortexUzLogFileDataAssistantStrategy.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/TaylorGreenVortexUz/LogFileDataAssistantStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Simulation/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Simulation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Simulation/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Simulation/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/L2NormLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/L2NormMathematicaAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2Norm/MathematicaAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/L2NormBetweenKernelsLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/L2NormBetweenKernelsMathematicaAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/L2NormBetweenKernels/MathematicaAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/NyLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/NyMathematicaAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/NyTest/MathematicaAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/PhiLogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/PhiMathematicaAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Tests/PhiTest/MathematicaAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/AlmostEquals.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/AlmostEquals.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/AlmostEquals.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/AlmostEquals.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/DataPoint/DataPoint.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/DataPoint/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/DataPoint/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/DataPoint/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileData.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroup.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroup.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroup.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroup.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/LogFileDataGroupImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataGroup/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/LogFileDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategy.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategy.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategy.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactory.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactory.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactory.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactory.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/LogFileDataAssistantStrategyFactoryImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyFactory/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/LogFileDataAssistantStrategyImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/LogFileDataAssistantStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileDataAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileReader/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/LogFileReader/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactory.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactory.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactory.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactory.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/MathematicaAssistantFactoryImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantFactory/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/MathematicaAssistantImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/TimeMathematicaAssistant.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/TimeAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaAssistant/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/MathematicaFile.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFile/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlot.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlot.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlot.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlot.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/MathematicaListPlotImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/LinePlot/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfLists.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfLists.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfLists.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfLists.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/MathematicaListOfListsImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/ListOfLists/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktion.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktion.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktion.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktion.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/MathematicaFunktionImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointList.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointList.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointList.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointList.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/MathematicaPointListImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/PointList/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunction/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactory.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactory.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactory.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactory.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/MathematicaFunctionFactoryImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunctionFactory/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/ListLinePlot/MathematicaListLinePlot.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/MathematicaFunktion/PointList/MathematicaPointList.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigData.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigData.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigData.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigData/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReader.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.h
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/Utilities/package.include b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/Utilities/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/Utilities/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/config.txt b/apps/gpu/tests/NumericalTestPostProcessing/config.txt
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/config.txt
rename to apps/gpu/tests/NumericalTestPostProcessing/config.txt
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/main.cpp b/apps/gpu/tests/NumericalTestPostProcessing/main.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/main.cpp
rename to apps/gpu/tests/NumericalTestPostProcessing/main.cpp
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/package.include b/apps/gpu/tests/NumericalTestPostProcessing/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/package.include
rename to apps/gpu/tests/NumericalTestPostProcessing/package.include
diff --git a/gpu/targets/tests/NumericalTestPostProcessing/test.nb b/apps/gpu/tests/NumericalTestPostProcessing/test.nb
similarity index 100%
rename from gpu/targets/tests/NumericalTestPostProcessing/test.nb
rename to apps/gpu/tests/NumericalTestPostProcessing/test.nb
diff --git a/gpu/targets/tests/NumericalTests/3rdPartyLinking.cmake b/apps/gpu/tests/NumericalTests/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/tests/NumericalTests/3rdPartyLinking.cmake
rename to apps/gpu/tests/NumericalTests/3rdPartyLinking.cmake
diff --git a/gpu/targets/tests/NumericalTests/CMakeLists.txt b/apps/gpu/tests/NumericalTests/CMakeLists.txt
similarity index 100%
rename from gpu/targets/tests/NumericalTests/CMakeLists.txt
rename to apps/gpu/tests/NumericalTests/CMakeLists.txt
diff --git a/gpu/targets/tests/NumericalTests/CMakePackage.cmake b/apps/gpu/tests/NumericalTests/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/tests/NumericalTests/CMakePackage.cmake
rename to apps/gpu/tests/NumericalTests/CMakePackage.cmake
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.cpp b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.h b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.h
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/package.include b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/InitialConditions/InitialConditionShearWave.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/package.include b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/InitialConditions/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/InitialConditions/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/InitialConditions/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/ShearWaveLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/ShearWaveParameterStruct.h b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/ShearWaveParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/ShearWaveParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/ShearWaveParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.cpp b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.h b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.h
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/ShearWaveSimulationInfo.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/package.include b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationInfo/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.cpp b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.h b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.h
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/package.include b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/ShearWave/package.include b/apps/gpu/tests/NumericalTests/Simulations/ShearWave/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/ShearWave/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/ShearWave/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUx.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/AnalyticalResults/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/InitialConditionTaylorGreenVortexUx.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/InitialConditions/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/LogFileInformationTaylorGreenVortexUx.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/SimulationInfoTaylorGreenVortexUx.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationInfo/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/SimulationParameterTaylorGreenVortexUx.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/SimulationParameter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/TaylorGreenVortexUxParameterStruct.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/TaylorGreenVortexUxParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/TaylorGreenVortexUxParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/TaylorGreenVortexUxParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUx/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUx/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/AnalyticalResultsTaylorGreenVortexUz.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/AnalyticalResults/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/InitialConditionTaylorGreenVortexUz.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/InitialConditions/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/LogFileInformationTaylorGreenVortexUz.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/SimulationInfoTaylorGreenVortexUz.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationInfo/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.cpp b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.cpp
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.cpp
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/SimulationParameterTaylorGreenVortexUz.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/SimulationParameter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/TaylorGreenVortexUzParameterStruct.h b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/TaylorGreenVortexUzParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/TaylorGreenVortexUzParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/TaylorGreenVortexUzParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/package.include b/apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Simulations/TaylorGreenVortexUz/package.include
rename to apps/gpu/tests/NumericalTests/Simulations/TaylorGreenVortexUz/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/L2NormTest.cpp b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/L2NormTest.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/L2NormTest.cpp
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/L2NormTest.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/L2NormTest.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/L2NormTest.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/L2NormTest.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/L2NormTest.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/L2NormTestParameterStruct.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/L2NormTestParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/L2NormTestParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/L2NormTestParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.cpp b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.cpp
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/L2NormLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.cpp b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.cpp
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/PostProcessingStrategyL2NormTest.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/package.include b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/package.include
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/PostProcessingStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTest/package.include b/apps/gpu/tests/NumericalTests/Tests/L2NormTest/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTest/package.include
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTest/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.cpp b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.cpp
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernels.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernelsParameterStruct.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernelsParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernelsParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/L2NormTestBetweenKernelsParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.cpp b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.cpp
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/L2NormLogFileInformationBetweenKernels.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.cpp b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.cpp
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.h b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.h
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/L2NormBetweenKernelPostProcessingStrategy.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/package.include b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/package.include
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/PostProcessingStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/package.include b/apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/L2NormTestBetweenKernels/package.include
rename to apps/gpu/tests/NumericalTests/Tests/L2NormTestBetweenKernels/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp b/apps/gpu/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.h b/apps/gpu/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/LogFileInformation/NyTestLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/NyTest.cpp b/apps/gpu/tests/NumericalTests/Tests/NyTest/NyTest.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/NyTest.cpp
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/NyTest.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/NyTest.h b/apps/gpu/tests/NumericalTests/Tests/NyTest/NyTest.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/NyTest.h
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/NyTest.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/NyTestParameterStruct.h b/apps/gpu/tests/NumericalTests/Tests/NyTest/NyTestParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/NyTestParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/NyTestParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.cpp b/apps/gpu/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.cpp
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.h b/apps/gpu/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.h
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/NyTestPostProcessingStrategy.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include b/apps/gpu/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/PostProcessingStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/NyTest/package.include b/apps/gpu/tests/NumericalTests/Tests/NyTest/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/NyTest/package.include
rename to apps/gpu/tests/NumericalTests/Tests/NyTest/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp b/apps/gpu/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.h b/apps/gpu/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/LogFileInformation/PhiTestLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/PhiTest.h b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/PhiTest.h
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTest.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/PhiTestParameterStruct.h b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTestParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/PhiTestParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/PhiTestParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.cpp b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.cpp
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.cpp
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.h b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.h
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/PhiTestPostProcessingStrategy.h
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include b/apps/gpu/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/PostProcessingStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTests/Tests/PhiTest/package.include b/apps/gpu/tests/NumericalTests/Tests/PhiTest/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Tests/PhiTest/package.include
rename to apps/gpu/tests/NumericalTests/Tests/PhiTest/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/AlmostEquals.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/AlmostEquals.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/AlmostEquals.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/AlmostEquals.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp b/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include b/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.cpp b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/L2CalculatorNormalizeWithAmplitude.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithAmplitude/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.cpp b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/L2CalculatorNormalizeWithBasicData.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2CalculatorNormalizeWithBasicData/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculator.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactory.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/L2NormCalculatorFactoryImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorFactory/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.h b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/L2NormCalculatorImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include b/apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/L2NormCalculator/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Calculator/package.include b/apps/gpu/tests/NumericalTests/Utilities/Calculator/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Calculator/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Calculator/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
rename to apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutput.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.h b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/ColorConsoleOutputImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include b/apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/ColorConsoleOutput/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
rename to apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriter.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.h b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.cpp b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.h b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.h
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/ToVectorWriter.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/DataWriter/package.include b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/DataWriter/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/DataWriter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp b/apps/gpu/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
rename to apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialCondition.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.h b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/InitialCondition/package.include b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/InitialCondition/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/InitialCondition/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
rename to apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfiguration.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.h b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/KernelConfigurationImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include b/apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/KernelConfiguration/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/KernelConfiguration/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/BasicSimulationInfo.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicSimulationInfo/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/BasicTestLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/BasicTestLogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/LogFileHead.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileHead/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileInformationImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/LogFileTimeInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/LogFileTimeInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/SimulationLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/SimulationLogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/TestLogFileInformation.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/TestLogFileInformation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/TestLogFileInformation.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/TestLogFileInformation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/TestLogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileInformation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileInformation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueue.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/LogFileQueueImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileQueue/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileQueue/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriter.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/LogFileWriterImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include b/apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/LogFileWriter/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/LogFileWriter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactory.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/NumericalTestFactoryImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestFactory/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestFactory/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/NumericalTestGridReader.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestGridReader/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/NumericalTestSimulation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestSimulation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestSuite/NumericalTestSuite.h b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSuite/NumericalTestSuite.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestSuite/NumericalTestSuite.h
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestSuite/NumericalTestSuite.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include b/apps/gpu/tests/NumericalTests/Utilities/NumericalTestSuite/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/NumericalTestSuite/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/NumericalTestSuite/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
rename to apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategy.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.h b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/PostProcessingStrategyImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include b/apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/PostProcessingStrategy/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
rename to apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResult.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.h b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/AnalyticalResultImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include b/apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Results/AnalyticalResults/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/Results.h b/apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/Results.h
rename to apps/gpu/tests/NumericalTests/Utilities/Results/Results.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/ResultsImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/Results/ResultsImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/ResultsImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Results/ResultsImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/ResultsImp.h b/apps/gpu/tests/NumericalTests/Utilities/Results/ResultsImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/ResultsImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/Results/ResultsImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.cpp b/apps/gpu/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.h b/apps/gpu/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.h
rename to apps/gpu/tests/NumericalTests/Utilities/Results/SimulationResults/SimulationResults.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include b/apps/gpu/tests/NumericalTests/Utilities/Results/SimulationResults/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/SimulationResults/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Results/SimulationResults/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Results/package.include b/apps/gpu/tests/NumericalTests/Utilities/Results/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Results/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Results/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfo.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/SimulationInfoImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include b/apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationInfo/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationInfo/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameter.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.h b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/package.include b/apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/SimulationParameter/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/SimulationParameter/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/BasicSimulationParameterStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/BasicSimulationParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/BasicSimulationParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/BasicSimulationParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/BasicTestParameterStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/BasicTestParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/BasicTestParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/BasicTestParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/ConfigDataStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/ConfigDataStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/ConfigDataStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/ConfigDataStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/GridInformationStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/GridInformationStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/GridInformationStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/GridInformationStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/LogFileParameterStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/LogFileParameterStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/LogFileParameterStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/LogFileParameterStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/NumericalTestStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/NumericalTestStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/NumericalTestStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/NumericalTestStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/SimulationDataStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/SimulationDataStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/SimulationDataStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/SimulationDataStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/TestSimulationDataStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/TestSimulationDataStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/TestSimulationDataStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/TestSimulationDataStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/TestStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/TestStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/TestStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/TestStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/VectorWriterInformationStruct.h b/apps/gpu/tests/NumericalTests/Utilities/Structs/VectorWriterInformationStruct.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/VectorWriterInformationStruct.h
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/VectorWriterInformationStruct.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Structs/package.include b/apps/gpu/tests/NumericalTests/Utilities/Structs/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Structs/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Structs/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Test/SimulationObserver.h b/apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Test/SimulationObserver.h
rename to apps/gpu/tests/NumericalTests/Utilities/Test/SimulationObserver.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Test/Test.h b/apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Test/Test.h
rename to apps/gpu/tests/NumericalTests/Utilities/Test/Test.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Test/TestImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Test/TestImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Test/TestImp.h b/apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Test/TestImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/Test/TestImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Test/TestStatus.h b/apps/gpu/tests/NumericalTests/Utilities/Test/TestStatus.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Test/TestStatus.h
rename to apps/gpu/tests/NumericalTests/Utilities/Test/TestStatus.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Test/package.include b/apps/gpu/tests/NumericalTests/Utilities/Test/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Test/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Test/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestQueue/TestQueue.h b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
rename to apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueue.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/TestQueue/TestQueueImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestQueue/package.include b/apps/gpu/tests/NumericalTests/Utilities/TestQueue/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestQueue/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/TestQueue/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
rename to apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/TestSimulation/TestSimulationImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/TestSimulation/package.include b/apps/gpu/tests/NumericalTests/Utilities/TestSimulation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/TestSimulation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/TestSimulation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Time/TimeImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Time/TimeImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Time/TimeImp.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Time/TimeImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/Time/TimeImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Time/TimeInfo.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Time/TimeInfo.h
rename to apps/gpu/tests/NumericalTests/Utilities/Time/TimeInfo.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Time/TimeTracking.h b/apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Time/TimeTracking.h
rename to apps/gpu/tests/NumericalTests/Utilities/Time/TimeTracking.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/Time/package.include b/apps/gpu/tests/NumericalTests/Utilities/Time/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/Time/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/Time/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulation.h b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulation.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulation.h
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulation.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.h b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/package.include
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.h b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.h
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactory.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.h b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.h
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.h
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.h
diff --git a/gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include
rename to apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/package.include
diff --git a/gpu/targets/tests/NumericalTests/config.txt b/apps/gpu/tests/NumericalTests/config.txt
similarity index 100%
rename from gpu/targets/tests/NumericalTests/config.txt
rename to apps/gpu/tests/NumericalTests/config.txt
diff --git a/gpu/targets/tests/NumericalTests/main.cpp b/apps/gpu/tests/NumericalTests/main.cpp
similarity index 100%
rename from gpu/targets/tests/NumericalTests/main.cpp
rename to apps/gpu/tests/NumericalTests/main.cpp
diff --git a/gpu/targets/tests/NumericalTests/package.include b/apps/gpu/tests/NumericalTests/package.include
similarity index 100%
rename from gpu/targets/tests/NumericalTests/package.include
rename to apps/gpu/tests/NumericalTests/package.include
diff --git a/gpu/targets/libs/GksGpu/3rdPartyLinking.cmake b/src/gpu/GksGpu/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/libs/GksGpu/3rdPartyLinking.cmake
rename to src/gpu/GksGpu/3rdPartyLinking.cmake
diff --git a/gpu/targets/libs/GksGpu/CMakeLists.txt b/src/gpu/GksGpu/CMakeLists.txt
similarity index 100%
rename from gpu/targets/libs/GksGpu/CMakeLists.txt
rename to src/gpu/GksGpu/CMakeLists.txt
diff --git a/gpu/targets/libs/GksGpu/CMakePackage.cmake b/src/gpu/GksGpu/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/libs/GksGpu/CMakePackage.cmake
rename to src/gpu/GksGpu/CMakePackage.cmake
diff --git a/gpu/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake b/src/gpu/GksMeshAdapter/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/libs/GksMeshAdapter/3rdPartyLinking.cmake
rename to src/gpu/GksMeshAdapter/3rdPartyLinking.cmake
diff --git a/gpu/targets/libs/GksMeshAdapter/CMakeLists.txt b/src/gpu/GksMeshAdapter/CMakeLists.txt
similarity index 100%
rename from gpu/targets/libs/GksMeshAdapter/CMakeLists.txt
rename to src/gpu/GksMeshAdapter/CMakeLists.txt
diff --git a/gpu/targets/libs/GksMeshAdapter/CMakePackage.cmake b/src/gpu/GksMeshAdapter/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/libs/GksMeshAdapter/CMakePackage.cmake
rename to src/gpu/GksMeshAdapter/CMakePackage.cmake
diff --git a/gpu/targets/libs/GksVtkAdapter/3rdPartyLinking.cmake b/src/gpu/GksVtkAdapter/3rdPartyLinking.cmake
similarity index 100%
rename from gpu/targets/libs/GksVtkAdapter/3rdPartyLinking.cmake
rename to src/gpu/GksVtkAdapter/3rdPartyLinking.cmake
diff --git a/gpu/targets/libs/GksVtkAdapter/CMakeLists.txt b/src/gpu/GksVtkAdapter/CMakeLists.txt
similarity index 100%
rename from gpu/targets/libs/GksVtkAdapter/CMakeLists.txt
rename to src/gpu/GksVtkAdapter/CMakeLists.txt
diff --git a/gpu/targets/libs/GksVtkAdapter/CMakePackage.cmake b/src/gpu/GksVtkAdapter/CMakePackage.cmake
similarity index 100%
rename from gpu/targets/libs/GksVtkAdapter/CMakePackage.cmake
rename to src/gpu/GksVtkAdapter/CMakePackage.cmake