diff --git a/gpu.cmake b/gpu.cmake
index 35c42354f635f391bf4645ac33bc873f9a5570dd..d4ea41e886266932200354375e5f74cd412ecbca 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -228,6 +228,5 @@ endif()
 
 if(VF.BUILD_VF_TRAFFIC)
     add_subdirectory(src/gpu/Traffic)
-
     add_subdirectory(apps/gpu/LBM/TrafficTest)
 endif()
\ No newline at end of file
diff --git a/gpu/src/GksGpu/Analyzer/ConvergenceAnalyzer.cpp b/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.cpp
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/ConvergenceAnalyzer.cpp
rename to src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.cpp
diff --git a/gpu/src/GksGpu/Analyzer/ConvergenceAnalyzer.h b/src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/ConvergenceAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/ConvergenceAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/CupsAnalyzer.cpp b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/CupsAnalyzer.cpp
rename to src/gpu/GksGpu/Analyzer/CupsAnalyzer.cpp
diff --git a/gpu/src/GksGpu/Analyzer/CupsAnalyzer.h b/src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/CupsAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/CupsAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/EnstrophyAnalyzer.cu b/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.cu
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/EnstrophyAnalyzer.cu
rename to src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.cu
diff --git a/gpu/src/GksGpu/Analyzer/EnstrophyAnalyzer.h b/src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/EnstrophyAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/HeatFluxAnalyzer.cu b/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.cu
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/HeatFluxAnalyzer.cu
rename to src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.cu
diff --git a/gpu/src/GksGpu/Analyzer/HeatFluxAnalyzer.h b/src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/HeatFluxAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/KineticEnergyAnalyzer.cu b/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.cu
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/KineticEnergyAnalyzer.cu
rename to src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.cu
diff --git a/gpu/src/GksGpu/Analyzer/KineticEnergyAnalyzer.h b/src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/KineticEnergyAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/KineticEnergyAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/PointTimeSeriesAnalyzer.cu b/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.cu
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/PointTimeSeriesAnalyzer.cu
rename to src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.cu
diff --git a/gpu/src/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h b/src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/PointTimeSeriesAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/PointTimeSeriesCollector.cpp b/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.cpp
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/PointTimeSeriesCollector.cpp
rename to src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.cpp
diff --git a/gpu/src/GksGpu/Analyzer/PointTimeSeriesCollector.h b/src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/PointTimeSeriesCollector.h
rename to src/gpu/GksGpu/Analyzer/PointTimeSeriesCollector.h
diff --git a/gpu/src/GksGpu/Analyzer/TurbulenceAnalyzer.cu b/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.cu
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/TurbulenceAnalyzer.cu
rename to src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.cu
diff --git a/gpu/src/GksGpu/Analyzer/TurbulenceAnalyzer.h b/src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/TurbulenceAnalyzer.h
rename to src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.h
diff --git a/gpu/src/GksGpu/Analyzer/package.include b/src/gpu/GksGpu/Analyzer/package.include
similarity index 100%
rename from gpu/src/GksGpu/Analyzer/package.include
rename to src/gpu/GksGpu/Analyzer/package.include
diff --git a/gpu/src/GksGpu/BoundaryConditions/AdiabaticWall.cu b/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/AdiabaticWall.cu
rename to src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/AdiabaticWall.h b/src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/AdiabaticWall.h
rename to src/gpu/GksGpu/BoundaryConditions/AdiabaticWall.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/BoundaryCondition.cpp b/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.cpp
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/BoundaryCondition.cpp
rename to src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.cpp
diff --git a/gpu/src/GksGpu/BoundaryConditions/BoundaryCondition.h b/src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/BoundaryCondition.h
rename to src/gpu/GksGpu/BoundaryConditions/BoundaryCondition.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu b/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu
rename to src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.h b/src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
rename to src/gpu/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/CreepingMassFlux.cu b/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/CreepingMassFlux.cu
rename to src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/CreepingMassFlux.h b/src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/CreepingMassFlux.h
rename to src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Extrapolation.cu b/src/gpu/GksGpu/BoundaryConditions/Extrapolation.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Extrapolation.cu
rename to src/gpu/GksGpu/BoundaryConditions/Extrapolation.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Extrapolation.h b/src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Extrapolation.h
rename to src/gpu/GksGpu/BoundaryConditions/Extrapolation.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/HeatFlux.cu b/src/gpu/GksGpu/BoundaryConditions/HeatFlux.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/HeatFlux.cu
rename to src/gpu/GksGpu/BoundaryConditions/HeatFlux.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/HeatFlux.h b/src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/HeatFlux.h
rename to src/gpu/GksGpu/BoundaryConditions/HeatFlux.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Inflow.cu b/src/gpu/GksGpu/BoundaryConditions/Inflow.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Inflow.cu
rename to src/gpu/GksGpu/BoundaryConditions/Inflow.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Inflow.h b/src/gpu/GksGpu/BoundaryConditions/Inflow.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Inflow.h
rename to src/gpu/GksGpu/BoundaryConditions/Inflow.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/InflowComplete.cu b/src/gpu/GksGpu/BoundaryConditions/InflowComplete.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/InflowComplete.cu
rename to src/gpu/GksGpu/BoundaryConditions/InflowComplete.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/InflowComplete.h b/src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/InflowComplete.h
rename to src/gpu/GksGpu/BoundaryConditions/InflowComplete.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/IsothermalWall.cu b/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/IsothermalWall.cu
rename to src/gpu/GksGpu/BoundaryConditions/IsothermalWall.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/IsothermalWall.h b/src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/IsothermalWall.h
rename to src/gpu/GksGpu/BoundaryConditions/IsothermalWall.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/MassCompensation.cu b/src/gpu/GksGpu/BoundaryConditions/MassCompensation.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/MassCompensation.cu
rename to src/gpu/GksGpu/BoundaryConditions/MassCompensation.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/MassCompensation.h b/src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/MassCompensation.h
rename to src/gpu/GksGpu/BoundaryConditions/MassCompensation.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Open.cu b/src/gpu/GksGpu/BoundaryConditions/Open.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Open.cu
rename to src/gpu/GksGpu/BoundaryConditions/Open.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Open.h b/src/gpu/GksGpu/BoundaryConditions/Open.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Open.h
rename to src/gpu/GksGpu/BoundaryConditions/Open.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu b/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu
rename to src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h b/src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
rename to src/gpu/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Periodic.cu b/src/gpu/GksGpu/BoundaryConditions/Periodic.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Periodic.cu
rename to src/gpu/GksGpu/BoundaryConditions/Periodic.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Periodic.h b/src/gpu/GksGpu/BoundaryConditions/Periodic.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Periodic.h
rename to src/gpu/GksGpu/BoundaryConditions/Periodic.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Pressure.cu b/src/gpu/GksGpu/BoundaryConditions/Pressure.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Pressure.cu
rename to src/gpu/GksGpu/BoundaryConditions/Pressure.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Pressure.h b/src/gpu/GksGpu/BoundaryConditions/Pressure.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Pressure.h
rename to src/gpu/GksGpu/BoundaryConditions/Pressure.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Pressure2.cu b/src/gpu/GksGpu/BoundaryConditions/Pressure2.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Pressure2.cu
rename to src/gpu/GksGpu/BoundaryConditions/Pressure2.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Pressure2.h b/src/gpu/GksGpu/BoundaryConditions/Pressure2.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Pressure2.h
rename to src/gpu/GksGpu/BoundaryConditions/Pressure2.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/SalinasVazquez.cu b/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/SalinasVazquez.cu
rename to src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/SalinasVazquez.h b/src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/SalinasVazquez.h
rename to src/gpu/GksGpu/BoundaryConditions/SalinasVazquez.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/Symmetry.cu b/src/gpu/GksGpu/BoundaryConditions/Symmetry.cu
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Symmetry.cu
rename to src/gpu/GksGpu/BoundaryConditions/Symmetry.cu
diff --git a/gpu/src/GksGpu/BoundaryConditions/Symmetry.h b/src/gpu/GksGpu/BoundaryConditions/Symmetry.h
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/Symmetry.h
rename to src/gpu/GksGpu/BoundaryConditions/Symmetry.h
diff --git a/gpu/src/GksGpu/BoundaryConditions/package.include b/src/gpu/GksGpu/BoundaryConditions/package.include
similarity index 100%
rename from gpu/src/GksGpu/BoundaryConditions/package.include
rename to src/gpu/GksGpu/BoundaryConditions/package.include
diff --git a/gpu/src/GksGpu/CellProperties/CellProperties.cuh b/src/gpu/GksGpu/CellProperties/CellProperties.cuh
similarity index 100%
rename from gpu/src/GksGpu/CellProperties/CellProperties.cuh
rename to src/gpu/GksGpu/CellProperties/CellProperties.cuh
diff --git a/gpu/src/GksGpu/CellProperties/package.include b/src/gpu/GksGpu/CellProperties/package.include
similarity index 100%
rename from gpu/src/GksGpu/CellProperties/package.include
rename to src/gpu/GksGpu/CellProperties/package.include
diff --git a/gpu/src/GksGpu/CellUpdate/CellUpdate.cu b/src/gpu/GksGpu/CellUpdate/CellUpdate.cu
similarity index 100%
rename from gpu/src/GksGpu/CellUpdate/CellUpdate.cu
rename to src/gpu/GksGpu/CellUpdate/CellUpdate.cu
diff --git a/gpu/src/GksGpu/CellUpdate/CellUpdate.h b/src/gpu/GksGpu/CellUpdate/CellUpdate.h
similarity index 100%
rename from gpu/src/GksGpu/CellUpdate/CellUpdate.h
rename to src/gpu/GksGpu/CellUpdate/CellUpdate.h
diff --git a/gpu/src/GksGpu/CellUpdate/Reaction.cuh b/src/gpu/GksGpu/CellUpdate/Reaction.cuh
similarity index 100%
rename from gpu/src/GksGpu/CellUpdate/Reaction.cuh
rename to src/gpu/GksGpu/CellUpdate/Reaction.cuh
diff --git a/gpu/src/GksGpu/CellUpdate/package.include b/src/gpu/GksGpu/CellUpdate/package.include
similarity index 100%
rename from gpu/src/GksGpu/CellUpdate/package.include
rename to src/gpu/GksGpu/CellUpdate/package.include
diff --git a/gpu/src/GksGpu/Communication/Communicator.cpp b/src/gpu/GksGpu/Communication/Communicator.cpp
similarity index 100%
rename from gpu/src/GksGpu/Communication/Communicator.cpp
rename to src/gpu/GksGpu/Communication/Communicator.cpp
diff --git a/gpu/src/GksGpu/Communication/Communicator.cu b/src/gpu/GksGpu/Communication/Communicator.cu
similarity index 100%
rename from gpu/src/GksGpu/Communication/Communicator.cu
rename to src/gpu/GksGpu/Communication/Communicator.cu
diff --git a/gpu/src/GksGpu/Communication/Communicator.h b/src/gpu/GksGpu/Communication/Communicator.h
similarity index 100%
rename from gpu/src/GksGpu/Communication/Communicator.h
rename to src/gpu/GksGpu/Communication/Communicator.h
diff --git a/gpu/src/GksGpu/Communication/MpiUtility.cpp b/src/gpu/GksGpu/Communication/MpiUtility.cpp
similarity index 100%
rename from gpu/src/GksGpu/Communication/MpiUtility.cpp
rename to src/gpu/GksGpu/Communication/MpiUtility.cpp
diff --git a/gpu/src/GksGpu/Communication/MpiUtility.h b/src/gpu/GksGpu/Communication/MpiUtility.h
similarity index 100%
rename from gpu/src/GksGpu/Communication/MpiUtility.h
rename to src/gpu/GksGpu/Communication/MpiUtility.h
diff --git a/gpu/src/GksGpu/Communication/package.include b/src/gpu/GksGpu/Communication/package.include
similarity index 100%
rename from gpu/src/GksGpu/Communication/package.include
rename to src/gpu/GksGpu/Communication/package.include
diff --git a/gpu/src/GksGpu/CudaUtility/CudaRunKernel.hpp b/src/gpu/GksGpu/CudaUtility/CudaRunKernel.hpp
similarity index 100%
rename from gpu/src/GksGpu/CudaUtility/CudaRunKernel.hpp
rename to src/gpu/GksGpu/CudaUtility/CudaRunKernel.hpp
diff --git a/gpu/src/GksGpu/CudaUtility/CudaUtility.cpp b/src/gpu/GksGpu/CudaUtility/CudaUtility.cpp
similarity index 100%
rename from gpu/src/GksGpu/CudaUtility/CudaUtility.cpp
rename to src/gpu/GksGpu/CudaUtility/CudaUtility.cpp
diff --git a/gpu/src/GksGpu/CudaUtility/CudaUtility.h b/src/gpu/GksGpu/CudaUtility/CudaUtility.h
similarity index 100%
rename from gpu/src/GksGpu/CudaUtility/CudaUtility.h
rename to src/gpu/GksGpu/CudaUtility/CudaUtility.h
diff --git a/gpu/src/GksGpu/CudaUtility/package.include b/src/gpu/GksGpu/CudaUtility/package.include
similarity index 100%
rename from gpu/src/GksGpu/CudaUtility/package.include
rename to src/gpu/GksGpu/CudaUtility/package.include
diff --git a/gpu/src/GksGpu/DataBase/DataBase.cpp b/src/gpu/GksGpu/DataBase/DataBase.cpp
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBase.cpp
rename to src/gpu/GksGpu/DataBase/DataBase.cpp
diff --git a/gpu/src/GksGpu/DataBase/DataBase.h b/src/gpu/GksGpu/DataBase/DataBase.h
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBase.h
rename to src/gpu/GksGpu/DataBase/DataBase.h
diff --git a/gpu/src/GksGpu/DataBase/DataBaseAllocator.cpp b/src/gpu/GksGpu/DataBase/DataBaseAllocator.cpp
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseAllocator.cpp
rename to src/gpu/GksGpu/DataBase/DataBaseAllocator.cpp
diff --git a/gpu/src/GksGpu/DataBase/DataBaseAllocator.h b/src/gpu/GksGpu/DataBase/DataBaseAllocator.h
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseAllocator.h
rename to src/gpu/GksGpu/DataBase/DataBaseAllocator.h
diff --git a/gpu/src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp b/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.cpp
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp
rename to src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.cpp
diff --git a/gpu/src/GksGpu/DataBase/DataBaseAllocatorCPU.h b/src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseAllocatorCPU.h
rename to src/gpu/GksGpu/DataBase/DataBaseAllocatorCPU.h
diff --git a/gpu/src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp b/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.cpp
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp
rename to src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.cpp
diff --git a/gpu/src/GksGpu/DataBase/DataBaseAllocatorGPU.h b/src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseAllocatorGPU.h
rename to src/gpu/GksGpu/DataBase/DataBaseAllocatorGPU.h
diff --git a/gpu/src/GksGpu/DataBase/DataBaseStruct.h b/src/gpu/GksGpu/DataBase/DataBaseStruct.h
similarity index 100%
rename from gpu/src/GksGpu/DataBase/DataBaseStruct.h
rename to src/gpu/GksGpu/DataBase/DataBaseStruct.h
diff --git a/gpu/src/GksGpu/DataBase/package.include b/src/gpu/GksGpu/DataBase/package.include
similarity index 100%
rename from gpu/src/GksGpu/DataBase/package.include
rename to src/gpu/GksGpu/DataBase/package.include
diff --git a/gpu/src/GksGpu/Definitions/AccumulatorDataType.h b/src/gpu/GksGpu/Definitions/AccumulatorDataType.h
similarity index 100%
rename from gpu/src/GksGpu/Definitions/AccumulatorDataType.h
rename to src/gpu/GksGpu/Definitions/AccumulatorDataType.h
diff --git a/gpu/src/GksGpu/Definitions/CudaAwareMpi.h b/src/gpu/GksGpu/Definitions/CudaAwareMpi.h
similarity index 100%
rename from gpu/src/GksGpu/Definitions/CudaAwareMpi.h
rename to src/gpu/GksGpu/Definitions/CudaAwareMpi.h
diff --git a/gpu/src/GksGpu/Definitions/MemoryAccessPattern.h b/src/gpu/GksGpu/Definitions/MemoryAccessPattern.h
similarity index 100%
rename from gpu/src/GksGpu/Definitions/MemoryAccessPattern.h
rename to src/gpu/GksGpu/Definitions/MemoryAccessPattern.h
diff --git a/gpu/src/GksGpu/Definitions/PassiveScalar.h b/src/gpu/GksGpu/Definitions/PassiveScalar.h
similarity index 100%
rename from gpu/src/GksGpu/Definitions/PassiveScalar.h
rename to src/gpu/GksGpu/Definitions/PassiveScalar.h
diff --git a/gpu/src/GksGpu/Definitions/package.include b/src/gpu/GksGpu/Definitions/package.include
similarity index 100%
rename from gpu/src/GksGpu/Definitions/package.include
rename to src/gpu/GksGpu/Definitions/package.include
diff --git a/gpu/src/GksGpu/FlowStateData/AccessDeviceData.cuh b/src/gpu/GksGpu/FlowStateData/AccessDeviceData.cuh
similarity index 100%
rename from gpu/src/GksGpu/FlowStateData/AccessDeviceData.cuh
rename to src/gpu/GksGpu/FlowStateData/AccessDeviceData.cuh
diff --git a/gpu/src/GksGpu/FlowStateData/FlowStateData.cuh b/src/gpu/GksGpu/FlowStateData/FlowStateData.cuh
similarity index 100%
rename from gpu/src/GksGpu/FlowStateData/FlowStateData.cuh
rename to src/gpu/GksGpu/FlowStateData/FlowStateData.cuh
diff --git a/gpu/src/GksGpu/FlowStateData/FlowStateDataConversion.cuh b/src/gpu/GksGpu/FlowStateData/FlowStateDataConversion.cuh
similarity index 100%
rename from gpu/src/GksGpu/FlowStateData/FlowStateDataConversion.cuh
rename to src/gpu/GksGpu/FlowStateData/FlowStateDataConversion.cuh
diff --git a/gpu/src/GksGpu/FlowStateData/HeatCapacities.cuh b/src/gpu/GksGpu/FlowStateData/HeatCapacities.cuh
similarity index 100%
rename from gpu/src/GksGpu/FlowStateData/HeatCapacities.cuh
rename to src/gpu/GksGpu/FlowStateData/HeatCapacities.cuh
diff --git a/gpu/src/GksGpu/FlowStateData/ThermalDependencies.cuh b/src/gpu/GksGpu/FlowStateData/ThermalDependencies.cuh
similarity index 100%
rename from gpu/src/GksGpu/FlowStateData/ThermalDependencies.cuh
rename to src/gpu/GksGpu/FlowStateData/ThermalDependencies.cuh
diff --git a/gpu/src/GksGpu/FlowStateData/package.include b/src/gpu/GksGpu/FlowStateData/package.include
similarity index 100%
rename from gpu/src/GksGpu/FlowStateData/package.include
rename to src/gpu/GksGpu/FlowStateData/package.include
diff --git a/gpu/src/GksGpu/FluxComputation/ApplyFlux.cuh b/src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/ApplyFlux.cuh
rename to src/gpu/GksGpu/FluxComputation/ApplyFlux.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/AssembleFlux.cuh b/src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/AssembleFlux.cuh
rename to src/gpu/GksGpu/FluxComputation/AssembleFlux.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/ExpansionCoefficients.cuh b/src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/ExpansionCoefficients.cuh
rename to src/gpu/GksGpu/FluxComputation/ExpansionCoefficients.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/FluxComputation.cu b/src/gpu/GksGpu/FluxComputation/FluxComputation.cu
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/FluxComputation.cu
rename to src/gpu/GksGpu/FluxComputation/FluxComputation.cu
diff --git a/gpu/src/GksGpu/FluxComputation/FluxComputation.h b/src/gpu/GksGpu/FluxComputation/FluxComputation.h
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/FluxComputation.h
rename to src/gpu/GksGpu/FluxComputation/FluxComputation.h
diff --git a/gpu/src/GksGpu/FluxComputation/Moments.cuh b/src/gpu/GksGpu/FluxComputation/Moments.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/Moments.cuh
rename to src/gpu/GksGpu/FluxComputation/Moments.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/Reconstruction.cuh b/src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/Reconstruction.cuh
rename to src/gpu/GksGpu/FluxComputation/Reconstruction.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/Smagorinsky.cuh b/src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/Smagorinsky.cuh
rename to src/gpu/GksGpu/FluxComputation/Smagorinsky.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/SutherlandsLaw.cuh b/src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/SutherlandsLaw.cuh
rename to src/gpu/GksGpu/FluxComputation/SutherlandsLaw.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/Transformation.cuh b/src/gpu/GksGpu/FluxComputation/Transformation.cuh
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/Transformation.cuh
rename to src/gpu/GksGpu/FluxComputation/Transformation.cuh
diff --git a/gpu/src/GksGpu/FluxComputation/package.include b/src/gpu/GksGpu/FluxComputation/package.include
similarity index 100%
rename from gpu/src/GksGpu/FluxComputation/package.include
rename to src/gpu/GksGpu/FluxComputation/package.include
diff --git a/gpu/src/GksGpu/Initializer/Initializer.cpp b/src/gpu/GksGpu/Initializer/Initializer.cpp
similarity index 100%
rename from gpu/src/GksGpu/Initializer/Initializer.cpp
rename to src/gpu/GksGpu/Initializer/Initializer.cpp
diff --git a/gpu/src/GksGpu/Initializer/Initializer.h b/src/gpu/GksGpu/Initializer/Initializer.h
similarity index 100%
rename from gpu/src/GksGpu/Initializer/Initializer.h
rename to src/gpu/GksGpu/Initializer/Initializer.h
diff --git a/gpu/src/GksGpu/Initializer/InitializerKernel.cu b/src/gpu/GksGpu/Initializer/InitializerKernel.cu
similarity index 100%
rename from gpu/src/GksGpu/Initializer/InitializerKernel.cu
rename to src/gpu/GksGpu/Initializer/InitializerKernel.cu
diff --git a/gpu/src/GksGpu/Initializer/package.include b/src/gpu/GksGpu/Initializer/package.include
similarity index 100%
rename from gpu/src/GksGpu/Initializer/package.include
rename to src/gpu/GksGpu/Initializer/package.include
diff --git a/gpu/src/GksGpu/Interface/CoarseToFineKernel.cu b/src/gpu/GksGpu/Interface/CoarseToFineKernel.cu
similarity index 100%
rename from gpu/src/GksGpu/Interface/CoarseToFineKernel.cu
rename to src/gpu/GksGpu/Interface/CoarseToFineKernel.cu
diff --git a/gpu/src/GksGpu/Interface/FineToCoarseKernel.cu b/src/gpu/GksGpu/Interface/FineToCoarseKernel.cu
similarity index 100%
rename from gpu/src/GksGpu/Interface/FineToCoarseKernel.cu
rename to src/gpu/GksGpu/Interface/FineToCoarseKernel.cu
diff --git a/gpu/src/GksGpu/Interface/Interface.h b/src/gpu/GksGpu/Interface/Interface.h
similarity index 100%
rename from gpu/src/GksGpu/Interface/Interface.h
rename to src/gpu/GksGpu/Interface/Interface.h
diff --git a/gpu/src/GksGpu/Interface/package.include b/src/gpu/GksGpu/Interface/package.include
similarity index 100%
rename from gpu/src/GksGpu/Interface/package.include
rename to src/gpu/GksGpu/Interface/package.include
diff --git a/gpu/src/GksGpu/Parameters/Parameters.h b/src/gpu/GksGpu/Parameters/Parameters.h
similarity index 100%
rename from gpu/src/GksGpu/Parameters/Parameters.h
rename to src/gpu/GksGpu/Parameters/Parameters.h
diff --git a/gpu/src/GksGpu/Parameters/package.include b/src/gpu/GksGpu/Parameters/package.include
similarity index 100%
rename from gpu/src/GksGpu/Parameters/package.include
rename to src/gpu/GksGpu/Parameters/package.include
diff --git a/gpu/src/GksGpu/Restart/Restart.cpp b/src/gpu/GksGpu/Restart/Restart.cpp
similarity index 100%
rename from gpu/src/GksGpu/Restart/Restart.cpp
rename to src/gpu/GksGpu/Restart/Restart.cpp
diff --git a/gpu/src/GksGpu/Restart/Restart.h b/src/gpu/GksGpu/Restart/Restart.h
similarity index 100%
rename from gpu/src/GksGpu/Restart/Restart.h
rename to src/gpu/GksGpu/Restart/Restart.h
diff --git a/gpu/src/GksGpu/Restart/package.include b/src/gpu/GksGpu/Restart/package.include
similarity index 100%
rename from gpu/src/GksGpu/Restart/package.include
rename to src/gpu/GksGpu/Restart/package.include
diff --git a/gpu/src/GksGpu/TimeStepping/NestedTimeStep.cpp b/src/gpu/GksGpu/TimeStepping/NestedTimeStep.cpp
similarity index 100%
rename from gpu/src/GksGpu/TimeStepping/NestedTimeStep.cpp
rename to src/gpu/GksGpu/TimeStepping/NestedTimeStep.cpp
diff --git a/gpu/src/GksGpu/TimeStepping/NestedTimeStep.h b/src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
similarity index 100%
rename from gpu/src/GksGpu/TimeStepping/NestedTimeStep.h
rename to src/gpu/GksGpu/TimeStepping/NestedTimeStep.h
diff --git a/gpu/src/GksGpu/TimeStepping/package.include b/src/gpu/GksGpu/TimeStepping/package.include
similarity index 100%
rename from gpu/src/GksGpu/TimeStepping/package.include
rename to src/gpu/GksGpu/TimeStepping/package.include
diff --git a/gpu/src/GksGpu/package.include b/src/gpu/GksGpu/package.include
similarity index 100%
rename from gpu/src/GksGpu/package.include
rename to src/gpu/GksGpu/package.include
diff --git a/gpu/src/GksMeshAdapter/GksMeshAdapter.cpp b/src/gpu/GksMeshAdapter/GksMeshAdapter.cpp
similarity index 100%
rename from gpu/src/GksMeshAdapter/GksMeshAdapter.cpp
rename to src/gpu/GksMeshAdapter/GksMeshAdapter.cpp
diff --git a/gpu/src/GksMeshAdapter/GksMeshAdapter.h b/src/gpu/GksMeshAdapter/GksMeshAdapter.h
similarity index 100%
rename from gpu/src/GksMeshAdapter/GksMeshAdapter.h
rename to src/gpu/GksMeshAdapter/GksMeshAdapter.h
diff --git a/gpu/src/GksMeshAdapter/MeshCell.cpp b/src/gpu/GksMeshAdapter/MeshCell.cpp
similarity index 100%
rename from gpu/src/GksMeshAdapter/MeshCell.cpp
rename to src/gpu/GksMeshAdapter/MeshCell.cpp
diff --git a/gpu/src/GksMeshAdapter/MeshCell.h b/src/gpu/GksMeshAdapter/MeshCell.h
similarity index 100%
rename from gpu/src/GksMeshAdapter/MeshCell.h
rename to src/gpu/GksMeshAdapter/MeshCell.h
diff --git a/gpu/src/GksMeshAdapter/MeshFace.cpp b/src/gpu/GksMeshAdapter/MeshFace.cpp
similarity index 100%
rename from gpu/src/GksMeshAdapter/MeshFace.cpp
rename to src/gpu/GksMeshAdapter/MeshFace.cpp
diff --git a/gpu/src/GksMeshAdapter/MeshFace.h b/src/gpu/GksMeshAdapter/MeshFace.h
similarity index 100%
rename from gpu/src/GksMeshAdapter/MeshFace.h
rename to src/gpu/GksMeshAdapter/MeshFace.h
diff --git a/gpu/src/GksMeshAdapter/package.include b/src/gpu/GksMeshAdapter/package.include
similarity index 100%
rename from gpu/src/GksMeshAdapter/package.include
rename to src/gpu/GksMeshAdapter/package.include
diff --git a/gpu/src/GksVtkAdapter/VTKAdapter.cpp b/src/gpu/GksVtkAdapter/VTKAdapter.cpp
similarity index 100%
rename from gpu/src/GksVtkAdapter/VTKAdapter.cpp
rename to src/gpu/GksVtkAdapter/VTKAdapter.cpp
diff --git a/gpu/src/GksVtkAdapter/VTKAdapter.h b/src/gpu/GksVtkAdapter/VTKAdapter.h
similarity index 100%
rename from gpu/src/GksVtkAdapter/VTKAdapter.h
rename to src/gpu/GksVtkAdapter/VTKAdapter.h
diff --git a/gpu/src/GksVtkAdapter/VTKInterface.h b/src/gpu/GksVtkAdapter/VTKInterface.h
similarity index 100%
rename from gpu/src/GksVtkAdapter/VTKInterface.h
rename to src/gpu/GksVtkAdapter/VTKInterface.h
diff --git a/gpu/src/GksVtkAdapter/package.include b/src/gpu/GksVtkAdapter/package.include
similarity index 100%
rename from gpu/src/GksVtkAdapter/package.include
rename to src/gpu/GksVtkAdapter/package.include