diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa345b8692c37c5449201ff893bdb63b6511cf32..301363e62538f9711981ac2d01059697f109f07b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,34 +17,14 @@ include("${CMAKE_PATH}/FileUtilities.cmake")
 include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
 
 
-SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
-SET(USE_METIS ON CACHE BOOL "include METIS library support")
-SET(USE_MPI ON CACHE BOOL "include MPI library support")
-SET(USE_VTK OFF CACHE BOOL "include VTK library support")
-SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
-SET(USE_BOOST OFF CACHE BOOL "include Boost support")
-#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
-#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
-SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
-SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
-SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
-SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
-IF(${USE_MPI})
-    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
-ENDIF()
-IF(${USE_METIS})
-    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
-ENDIF()
-# FIND MPI
-IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
-    FIND_PACKAGE(MPI REQUIRED)
-ENDIF()
+
 
 add_subdirectory(src/basics)
 
 #if (BUILD_VF_CPU)
-    add_subdirectory(3rdParty/MuParser)
-    add_subdirectory(cpu)
+#    add_subdirectory(3rdParty/MuParser)
+#    add_subdirectory(cpu)
+include (cpu.cmake)
 #endif()
 #if(BUILD_VF_GPU)
 #    add_subdirectory(gpu)
diff --git a/apps/cpu/IncludsList.cmake b/apps/cpu/IncludsList.cmake
index bea9a1e25f68d90285a081e4cecfa3f9c40ec84b..98341df07ca3318610f9f32fe840c5bce7e7fd8c 100644
--- a/apps/cpu/IncludsList.cmake
+++ b/apps/cpu/IncludsList.cmake
@@ -1,5 +1,5 @@
 INCLUDE_DIRECTORIES(${APPS_ROOT_CPU})
-INCLUDE(${CMAKE_SOURCE_DIR}/cpu/VirtualFluidsCore/IncludsList.cmake)
+INCLUDE(${CMAKE_SOURCE_DIR}/src/cpu/VirtualFluidsCore/IncludsList.cmake)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/basics/numerics/geometry3d)
diff --git a/cpu.cmake b/cpu.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..98d408952546ded61c69b21d1c1b5723099be9f9
--- /dev/null
+++ b/cpu.cmake
@@ -0,0 +1,168 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+
+#workaround for machine with mpi compiler wrapper
+#it most define before project
+
+#MPI
+#set(CMAKE_C_COMPILER mpicc)
+#set(CMAKE_CXX_COMPILER mpicxx)
+
+#Intel MPI
+#set(CMAKE_C_COMPILER mpiicc)
+#set(CMAKE_CXX_COMPILER mpiicpc)
+
+#Cray
+#set(CMAKE_C_COMPILER cc)
+#set(CMAKE_CXX_COMPILER CC)
+
+#SuperMUC
+#set(CMAKE_C_COMPILER mpicc)
+#set(CMAKE_CXX_COMPILER mpiCC)
+
+PROJECT(VirtualFluids)
+set (SOURCE_DIR ${PROJECT_SOURCE_DIR})
+set(SOURCE_ROOT "../source")
+
+#debug build for unix
+#IF(UNIX)
+#SET(CMAKE_BUILD_TYPE DEBUG)
+#ENDIF()
+
+SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
+SET(USE_METIS ON CACHE BOOL "include METIS library support")
+SET(USE_MPI ON CACHE BOOL "include MPI library support")
+SET(USE_VTK OFF CACHE BOOL "include VTK library support")
+SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(USE_BOOST OFF CACHE BOOL "include Boost support")
+#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
+#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
+SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
+SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
+SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
+SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
+
+#CAB
+include("CMake/CMakeCABMacros.cmake")
+include("CMake/FileUtilities.cmake")
+include("CMake/VirtualFluidsMacros.cmake")
+
+#MPI
+IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
+    FIND_PACKAGE(MPI REQUIRED)
+ENDIF()
+#SET(MPI_CXX_LINK_FLAGS -mpe=mpilog)
+
+#SET(BOOST_USE_MULTITHREAD ON)
+#SET(Boost_USE_STATIC_LIBS ON)
+#SET(Boost_DEBUG TRUE)
+
+#SET(bv ${BOOST_VERSION}) #hack for find boost, after next command ${BOOST_VERSION} would be set to 0
+#FIND_PACKAGE(Boost ${bv} COMPONENTS system date_time thread serialization chrono regex)
+#FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex)
+#FIND_PACKAGE(Boost ${bv} COMPONENTS system thread serialization date_time)
+#SET(BOOST_VERSION ${bv})
+#IF(${USE_PYTHON})
+#  FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex python)
+#ELSE(${USE_PYTHON})
+#    FIND_PACKAGE(Boost ${BOOST_VERSION} COMPONENTS system date_time thread serialization chrono regex)
+#ENDIF()
+
+IF(${USE_BOOST})
+    FIND_PACKAGE(Boost ${BOOST_VERSION})
+ENDIF()
+
+##################################################################################
+#  Java
+##############################################################################
+### FindJNI.cmake
+# IF(${USE_FETOL})
+# find_package(JNI REQUIRED)
+# ENDIF()
+
+#VTK
+IF(${USE_VTK})
+    #find_package(VTK 6.1 NO_MODULE)
+    FIND_PACKAGE(VTK REQUIRED)
+    INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
+    MESSAGE("VTK_INCLUDE_DIRS = " ${VTK_INCLUDE_DIRS})
+ENDIF()
+
+IF(${USE_CATALYST})
+    find_package(ParaView 4.3 REQUIRED COMPONENTS vtkPVPythonCatalyst)
+    include("${PARAVIEW_USE_FILE}")
+ENDIF()
+
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_BOOST)
+LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DNOMINMAX)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DCAB_RUBY)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -mpe=mpilog)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -noshlib)
+#LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DSINGLEPRECISION)
+
+IF(${USE_ZOLTAN})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_ZOLTAN)
+ENDIF()
+IF(${USE_METIS})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
+ENDIF()
+IF(${USE_MPI})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
+ENDIF()
+# IF(${USE_FETOL})
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_FETOL)
+# ENDIF()
+IF(${USE_VTK})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_VTK)
+ENDIF()
+IF(${USE_CATALYST})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_CATALYST)
+ENDIF()
+
+IF(${USE_BOOST})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_BOOST)
+ENDIF()
+
+IF(${USE_HLRN_LUSTRE})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DHLRN_LUSTRE)
+ENDIF()
+
+IF(${USE_INTEL})
+    SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -parallel)
+ENDIF()
+
+IF(${USE_GCC})
+    SET(CAB_ADDITIONAL_LINK_FLAGS ${CAB_ADDITIONAL_LINK_FLAGS} -lgomp)
+ENDIF()
+
+
+# IF(${USE_PYTHON})
+# FIND_PACKAGE(PythonLibs)
+# INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_PYTHON)
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DBOOST_PYTHON_STATIC_LIB)
+# add_subdirectory(python)
+# ENDIF()
+
+# IF(${USE_INTEL})
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_IGNORE_CXX_SEEK)
+# LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DMPICH_SKIP_MPICXX)
+# ENDIF()
+#message("MPI_CXX_LIBRARY: " ${MPI_CXX_LIBRARY})
+#IF(MPI_CXX_LIBRARY)
+#SET(MPI_LIBRARY ${MPI_LIBRARY} ${MPI_CXX_LIBRARY})
+#message("MPI_LIBRARY: " ${MPI_LIBRARY})
+#ENDIF() 
+
+
+#IF(${USE_DEM_COUPLING})
+#    add_subdirectory(Plugins/dem_coupling)
+#ENDIF()
+
+add_subdirectory(3rdParty/MuParser)
+
+add_subdirectory(src/cpu/VirtualFluidsCore)
+#add_subdirectory(VirtualFluidsBasic)
+
+#set(APPS_ROOT "${SOURCE_ROOT}/cpu/Applications")
+#INCLUDE(${APPS_ROOT}/Applications.cmake)
\ No newline at end of file
diff --git a/gpu.cmake b/gpu.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..aa345b8692c37c5449201ff893bdb63b6511cf32
--- /dev/null
+++ b/gpu.cmake
@@ -0,0 +1,54 @@
+cmake_minimum_required(VERSION 3.9..3.17 FATAL_ERROR)
+
+if(${CMAKE_VERSION} VERSION_LESS 3.12)
+    cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+endif()
+
+project(VirtualFluids CXX)
+
+set (CMAKE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
+option(BUILD_VF_CPU "Build VirtualFluids cpu variant" OFF)
+option(BUILD_VF_GPU "Build VirtualFluids gpu variant" ON)
+
+
+include("${CMAKE_PATH}/CMakeCABMacros.cmake")
+include("${CMAKE_PATH}/FileUtilities.cmake")
+include("${CMAKE_PATH}/VirtualFluidsMacros.cmake")
+
+
+SET(USE_ZOLTAN OFF CACHE BOOL "include Zoltan library support")
+SET(USE_METIS ON CACHE BOOL "include METIS library support")
+SET(USE_MPI ON CACHE BOOL "include MPI library support")
+SET(USE_VTK OFF CACHE BOOL "include VTK library support")
+SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(USE_BOOST OFF CACHE BOOL "include Boost support")
+#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
+#SET(USE_FETOL OFF CACHE BOOL "include FETOL library support")
+SET(USE_INTEL OFF CACHE BOOL "include Intel compiler support")
+SET(USE_GCC OFF CACHE BOOL "include gcc compiler support")
+SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
+SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
+IF(${USE_MPI})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_MPI)
+ENDIF()
+IF(${USE_METIS})
+    LIST(APPEND CAB_ADDTIONAL_COMPILER_FLAGS -DVF_METIS)
+ENDIF()
+# FIND MPI
+IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
+    FIND_PACKAGE(MPI REQUIRED)
+ENDIF()
+
+add_subdirectory(src/basics)
+
+#if (BUILD_VF_CPU)
+    add_subdirectory(3rdParty/MuParser)
+    add_subdirectory(cpu)
+#endif()
+#if(BUILD_VF_GPU)
+#    add_subdirectory(gpu)
+#endif()
+
+set (APPS_ROOT_CPU "${CMAKE_SOURCE_DIR}/apps/cpu/")
+include(${APPS_ROOT_CPU}/Applications.cmake)
\ No newline at end of file
diff --git a/cpu/DemCoupling/CMakePackage.txt b/src/cpu/DemCoupling/CMakePackage.txt
similarity index 100%
rename from cpu/DemCoupling/CMakePackage.txt
rename to src/cpu/DemCoupling/CMakePackage.txt
diff --git a/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp b/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
similarity index 100%
rename from cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
rename to src/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
diff --git a/cpu/DemCoupling/CreateDemObjectsCoProcessor.h b/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.h
similarity index 100%
rename from cpu/DemCoupling/CreateDemObjectsCoProcessor.h
rename to src/cpu/DemCoupling/CreateDemObjectsCoProcessor.h
diff --git a/cpu/DemCoupling/DemCoProcessor.cpp b/src/cpu/DemCoupling/DemCoProcessor.cpp
similarity index 100%
rename from cpu/DemCoupling/DemCoProcessor.cpp
rename to src/cpu/DemCoupling/DemCoProcessor.cpp
diff --git a/cpu/DemCoupling/DemCoProcessor.h b/src/cpu/DemCoupling/DemCoProcessor.h
similarity index 100%
rename from cpu/DemCoupling/DemCoProcessor.h
rename to src/cpu/DemCoupling/DemCoProcessor.h
diff --git a/cpu/DemCoupling/DemCoupling.cmake b/src/cpu/DemCoupling/DemCoupling.cmake
similarity index 100%
rename from cpu/DemCoupling/DemCoupling.cmake
rename to src/cpu/DemCoupling/DemCoupling.cmake
diff --git a/cpu/DemCoupling/IncludsList.cmake b/src/cpu/DemCoupling/IncludsList.cmake
similarity index 100%
rename from cpu/DemCoupling/IncludsList.cmake
rename to src/cpu/DemCoupling/IncludsList.cmake
diff --git a/cpu/DemCoupling/MovableObjectInteractor.cpp b/src/cpu/DemCoupling/MovableObjectInteractor.cpp
similarity index 100%
rename from cpu/DemCoupling/MovableObjectInteractor.cpp
rename to src/cpu/DemCoupling/MovableObjectInteractor.cpp
diff --git a/cpu/DemCoupling/MovableObjectInteractor.h b/src/cpu/DemCoupling/MovableObjectInteractor.h
similarity index 100%
rename from cpu/DemCoupling/MovableObjectInteractor.h
rename to src/cpu/DemCoupling/MovableObjectInteractor.h
diff --git a/cpu/DemCoupling/PePartitioningGridVisitor.cpp b/src/cpu/DemCoupling/PePartitioningGridVisitor.cpp
similarity index 100%
rename from cpu/DemCoupling/PePartitioningGridVisitor.cpp
rename to src/cpu/DemCoupling/PePartitioningGridVisitor.cpp
diff --git a/cpu/DemCoupling/PePartitioningGridVisitor.h b/src/cpu/DemCoupling/PePartitioningGridVisitor.h
similarity index 100%
rename from cpu/DemCoupling/PePartitioningGridVisitor.h
rename to src/cpu/DemCoupling/PePartitioningGridVisitor.h
diff --git a/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp b/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
similarity index 100%
rename from cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
rename to src/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
diff --git a/cpu/DemCoupling/RestartDemObjectsCoProcessor.h b/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.h
similarity index 100%
rename from cpu/DemCoupling/RestartDemObjectsCoProcessor.h
rename to src/cpu/DemCoupling/RestartDemObjectsCoProcessor.h
diff --git a/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp b/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
similarity index 100%
rename from cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
rename to src/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
diff --git a/cpu/DemCoupling/WriteDemObjectsCoProcessor.h b/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.h
similarity index 100%
rename from cpu/DemCoupling/WriteDemObjectsCoProcessor.h
rename to src/cpu/DemCoupling/WriteDemObjectsCoProcessor.h
diff --git a/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp b/src/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp
similarity index 100%
rename from cpu/DemCoupling/WritePeBlocksCoProcessor.cpp
rename to src/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp
diff --git a/cpu/DemCoupling/WritePeBlocksCoProcessor.h b/src/cpu/DemCoupling/WritePeBlocksCoProcessor.h
similarity index 100%
rename from cpu/DemCoupling/WritePeBlocksCoProcessor.h
rename to src/cpu/DemCoupling/WritePeBlocksCoProcessor.h
diff --git a/cpu/DemCoupling/package.include b/src/cpu/DemCoupling/package.include
similarity index 100%
rename from cpu/DemCoupling/package.include
rename to src/cpu/DemCoupling/package.include
diff --git a/cpu/DemCoupling/physicsEngineAdapter/CMakePackage.txt b/src/cpu/DemCoupling/physicsEngineAdapter/CMakePackage.txt
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/CMakePackage.txt
rename to src/cpu/DemCoupling/physicsEngineAdapter/CMakePackage.txt
diff --git a/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/CMakePackage.txt b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/CMakePackage.txt
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/CMakePackage.txt
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/CMakePackage.txt
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/dummy/package.include b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/package.include
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/dummy/package.include
rename to src/cpu/DemCoupling/physicsEngineAdapter/dummy/package.include
diff --git a/cpu/DemCoupling/physicsEngineAdapter/package.include b/src/cpu/DemCoupling/physicsEngineAdapter/package.include
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/package.include
rename to src/cpu/DemCoupling/physicsEngineAdapter/package.include
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/CMakePackage.txt b/src/cpu/DemCoupling/physicsEngineAdapter/pe/CMakePackage.txt
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/CMakePackage.txt
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/CMakePackage.txt
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h
diff --git a/cpu/DemCoupling/physicsEngineAdapter/pe/package.include b/src/cpu/DemCoupling/physicsEngineAdapter/pe/package.include
similarity index 100%
rename from cpu/DemCoupling/physicsEngineAdapter/pe/package.include
rename to src/cpu/DemCoupling/physicsEngineAdapter/pe/package.include
diff --git a/cpu/DemCoupling/reconstructor/CMakePackage.txt b/src/cpu/DemCoupling/reconstructor/CMakePackage.txt
similarity index 100%
rename from cpu/DemCoupling/reconstructor/CMakePackage.txt
rename to src/cpu/DemCoupling/reconstructor/CMakePackage.txt
diff --git a/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp
similarity index 100%
rename from cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp
rename to src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp
diff --git a/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h b/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h
similarity index 100%
rename from cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h
rename to src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h
diff --git a/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp
similarity index 100%
rename from cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp
rename to src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp
diff --git a/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h b/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h
similarity index 100%
rename from cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h
rename to src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h
diff --git a/cpu/DemCoupling/reconstructor/LBMReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/LBMReconstructor.cpp
similarity index 100%
rename from cpu/DemCoupling/reconstructor/LBMReconstructor.cpp
rename to src/cpu/DemCoupling/reconstructor/LBMReconstructor.cpp
diff --git a/cpu/DemCoupling/reconstructor/LBMReconstructor.h b/src/cpu/DemCoupling/reconstructor/LBMReconstructor.h
similarity index 100%
rename from cpu/DemCoupling/reconstructor/LBMReconstructor.h
rename to src/cpu/DemCoupling/reconstructor/LBMReconstructor.h
diff --git a/cpu/DemCoupling/reconstructor/Reconstructor.h b/src/cpu/DemCoupling/reconstructor/Reconstructor.h
similarity index 100%
rename from cpu/DemCoupling/reconstructor/Reconstructor.h
rename to src/cpu/DemCoupling/reconstructor/Reconstructor.h
diff --git a/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp
similarity index 100%
rename from cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp
rename to src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp
diff --git a/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h b/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h
similarity index 100%
rename from cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h
rename to src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h
diff --git a/cpu/DemCoupling/reconstructor/package.include b/src/cpu/DemCoupling/reconstructor/package.include
similarity index 100%
rename from cpu/DemCoupling/reconstructor/package.include
rename to src/cpu/DemCoupling/reconstructor/package.include
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/CMakePackage.txt b/src/cpu/VirtualFluidsCore/BoundaryConditions/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
diff --git a/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h
similarity index 100%
rename from cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h
diff --git a/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/CMakeLists.txt
rename to src/cpu/VirtualFluidsCore/CMakeLists.txt
diff --git a/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/CMakePackage.txt b/src/cpu/VirtualFluidsCore/CoProcessors/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/CoProcessors/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.h b/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.h b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
diff --git a/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/Block3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.h b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.h
rename to src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.h
diff --git a/cpu/VirtualFluidsCore/Connectors/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Connectors/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Connectors/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
rename to src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullDirectConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFullVectorConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.cpp b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.h
rename to src/cpu/VirtualFluidsCore/Connectors/D3Q27ETOffConnectorFactory.h
diff --git a/cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/FineToCoarseBlock3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.cpp
rename to src/cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.cpp
diff --git a/cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.h
rename to src/cpu/VirtualFluidsCore/Connectors/RemoteBlock3DConnector.h
diff --git a/cpu/VirtualFluidsCore/Connectors/TransmitterType.h b/src/cpu/VirtualFluidsCore/Connectors/TransmitterType.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Connectors/TransmitterType.h
rename to src/cpu/VirtualFluidsCore/Connectors/TransmitterType.h
diff --git a/cpu/VirtualFluidsCore/Data/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Data/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Data/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
rename to src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
diff --git a/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.h b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.h
rename to src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.h
diff --git a/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
rename to src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
diff --git a/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h
rename to src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h
diff --git a/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.cpp
rename to src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.cpp
diff --git a/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.h b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.h
rename to src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVectorEx.h
diff --git a/cpu/VirtualFluidsCore/Data/DataSet3D.h b/src/cpu/VirtualFluidsCore/Data/DataSet3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/DataSet3D.h
rename to src/cpu/VirtualFluidsCore/Data/DataSet3D.h
diff --git a/cpu/VirtualFluidsCore/Data/DistributionArray3D.h b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/DistributionArray3D.h
rename to src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
diff --git a/cpu/VirtualFluidsCore/Data/EsoTwist3D.h b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/EsoTwist3D.h
rename to src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
diff --git a/cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.cpp b/src/cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.cpp
rename to src/cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.cpp
diff --git a/cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.h b/src/cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.h
rename to src/cpu/VirtualFluidsCore/Data/EsoTwistD3Q27System.h
diff --git a/cpu/VirtualFluidsCore/Data/VoidData3D.h b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Data/VoidData3D.h
rename to src/cpu/VirtualFluidsCore/Data/VoidData3D.h
diff --git a/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
rename to src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
diff --git a/cpu/VirtualFluidsCore/Grid/BasicCalculator.h b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/BasicCalculator.h
rename to src/cpu/VirtualFluidsCore/Grid/BasicCalculator.h
diff --git a/cpu/VirtualFluidsCore/Grid/Block3D.cpp b/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Block3D.cpp
rename to src/cpu/VirtualFluidsCore/Grid/Block3D.cpp
diff --git a/cpu/VirtualFluidsCore/Grid/Block3D.h b/src/cpu/VirtualFluidsCore/Grid/Block3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Block3D.h
rename to src/cpu/VirtualFluidsCore/Grid/Block3D.h
diff --git a/cpu/VirtualFluidsCore/Grid/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Grid/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Grid/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Grid/Calculator.cpp b/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Calculator.cpp
rename to src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
diff --git a/cpu/VirtualFluidsCore/Grid/Calculator.h b/src/cpu/VirtualFluidsCore/Grid/Calculator.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Calculator.h
rename to src/cpu/VirtualFluidsCore/Grid/Calculator.h
diff --git a/cpu/VirtualFluidsCore/Grid/Grid3D.cpp b/src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Grid3D.cpp
rename to src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp
diff --git a/cpu/VirtualFluidsCore/Grid/Grid3D.h b/src/cpu/VirtualFluidsCore/Grid/Grid3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Grid3D.h
rename to src/cpu/VirtualFluidsCore/Grid/Grid3D.h
diff --git a/cpu/VirtualFluidsCore/Grid/Grid3DSystem.cpp b/src/cpu/VirtualFluidsCore/Grid/Grid3DSystem.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Grid3DSystem.cpp
rename to src/cpu/VirtualFluidsCore/Grid/Grid3DSystem.cpp
diff --git a/cpu/VirtualFluidsCore/Grid/Grid3DSystem.h b/src/cpu/VirtualFluidsCore/Grid/Grid3DSystem.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Grid/Grid3DSystem.h
rename to src/cpu/VirtualFluidsCore/Grid/Grid3DSystem.h
diff --git a/cpu/VirtualFluidsCore/IncludsList.cmake b/src/cpu/VirtualFluidsCore/IncludsList.cmake
similarity index 96%
rename from cpu/VirtualFluidsCore/IncludsList.cmake
rename to src/cpu/VirtualFluidsCore/IncludsList.cmake
index 09aa3a777cb82a77cf86ec2f22f228a4cb650b3e..878893a4faa558a0f49788e8c8262ff405f98330 100644
--- a/cpu/VirtualFluidsCore/IncludsList.cmake
+++ b/src/cpu/VirtualFluidsCore/IncludsList.cmake
@@ -1,6 +1,6 @@
 #directory pathes for header files
 
-set (SOURCE_DIR "${CMAKE_SOURCE_DIR}/cpu/")
+set (SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/cpu/")
 
 INCLUDE_DIRECTORIES(${SOURCE_DIR}/VirtualFluidsCore)
 INCLUDE_DIRECTORIES(${SOURCE_DIR}/VirtualFluidsCore/BoundaryConditions)
diff --git a/cpu/VirtualFluidsCore/Interactors/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Interactors/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Interactors/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
rename to src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
diff --git a/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h
rename to src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h
diff --git a/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
rename to src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
diff --git a/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
rename to src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
diff --git a/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp b/src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp
rename to src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp
diff --git a/cpu/VirtualFluidsCore/Interactors/Interactor3D.h b/src/cpu/VirtualFluidsCore/Interactors/Interactor3D.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/Interactor3D.h
rename to src/cpu/VirtualFluidsCore/Interactors/Interactor3D.h
diff --git a/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp b/src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp
rename to src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp
diff --git a/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.h b/src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/InteractorsHelper.h
rename to src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.h
diff --git a/cpu/VirtualFluidsCore/Interactors/package.include b/src/cpu/VirtualFluidsCore/Interactors/package.include
similarity index 100%
rename from cpu/VirtualFluidsCore/Interactors/package.include
rename to src/cpu/VirtualFluidsCore/Interactors/package.include
diff --git a/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/CMakePackage.txt b/src/cpu/VirtualFluidsCore/LBM/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/LBM/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
diff --git a/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
rename to src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/D3Q27System.h b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/D3Q27System.h
rename to src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
diff --git a/cpu/VirtualFluidsCore/LBM/ICell.h b/src/cpu/VirtualFluidsCore/LBM/ICell.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/ICell.h
rename to src/cpu/VirtualFluidsCore/LBM/ICell.h
diff --git a/cpu/VirtualFluidsCore/LBM/ILBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/ILBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
diff --git a/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
rename to src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
rename to src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
diff --git a/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
rename to src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
rename to src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
diff --git a/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
diff --git a/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
rename to src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h
rename to src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h
diff --git a/cpu/VirtualFluidsCore/LBM/LBMSystem.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMSystem.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMSystem.cpp
rename to src/cpu/VirtualFluidsCore/LBM/LBMSystem.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/LBMSystem.h b/src/cpu/VirtualFluidsCore/LBM/LBMSystem.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMSystem.h
rename to src/cpu/VirtualFluidsCore/LBM/LBMSystem.h
diff --git a/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h b/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
rename to src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
diff --git a/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
rename to src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
diff --git a/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.h
similarity index 100%
rename from cpu/VirtualFluidsCore/LBM/VoidLBMKernel.h
rename to src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.h
diff --git a/cpu/VirtualFluidsCore/Parallel/BlocksDistributor.cpp b/src/cpu/VirtualFluidsCore/Parallel/BlocksDistributor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/BlocksDistributor.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/BlocksDistributor.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/BlocksDistributor.h b/src/cpu/VirtualFluidsCore/Parallel/BlocksDistributor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/BlocksDistributor.h
rename to src/cpu/VirtualFluidsCore/Parallel/BlocksDistributor.h
diff --git a/cpu/VirtualFluidsCore/Parallel/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Parallel/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Parallel/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Parallel/Communicator.cpp b/src/cpu/VirtualFluidsCore/Parallel/Communicator.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/Communicator.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/Communicator.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/Communicator.h b/src/cpu/VirtualFluidsCore/Parallel/Communicator.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/Communicator.h
rename to src/cpu/VirtualFluidsCore/Parallel/Communicator.h
diff --git a/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp b/src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/MPICommunicator.h b/src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/MPICommunicator.h
rename to src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.h
diff --git a/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
rename to src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
diff --git a/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h
rename to src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.h
diff --git a/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp b/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/NullCommunicator.h b/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/NullCommunicator.h
rename to src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.h
diff --git a/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.cpp b/src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h b/src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h
rename to src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h
diff --git a/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h b/src/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h
rename to src/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h
diff --git a/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp b/src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp
rename to src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp
diff --git a/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.h b/src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.h
rename to src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.h
diff --git a/cpu/VirtualFluidsCore/PointerDefinitions.h b/src/cpu/VirtualFluidsCore/PointerDefinitions.h
similarity index 100%
rename from cpu/VirtualFluidsCore/PointerDefinitions.h
rename to src/cpu/VirtualFluidsCore/PointerDefinitions.h
diff --git a/cpu/VirtualFluidsCore/Utilities/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Utilities/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Utilities/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp b/src/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp
rename to src/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp
diff --git a/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
rename to src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
diff --git a/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h
rename to src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h
diff --git a/cpu/VirtualFluidsCore/Utilities/ConfigurationFile.hpp b/src/cpu/VirtualFluidsCore/Utilities/ConfigurationFile.hpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/ConfigurationFile.hpp
rename to src/cpu/VirtualFluidsCore/Utilities/ConfigurationFile.hpp
diff --git a/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp b/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/MathUtil.hpp
rename to src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp
diff --git a/cpu/VirtualFluidsCore/Utilities/MemoryUtil.h b/src/cpu/VirtualFluidsCore/Utilities/MemoryUtil.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/MemoryUtil.h
rename to src/cpu/VirtualFluidsCore/Utilities/MemoryUtil.h
diff --git a/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp b/src/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp
rename to src/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp
diff --git a/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/CMakePackage.txt b/src/cpu/VirtualFluidsCore/Visitors/CMakePackage.txt
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CMakePackage.txt
rename to src/cpu/VirtualFluidsCore/Visitors/CMakePackage.txt
diff --git a/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp b/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h b/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h
rename to src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h
diff --git a/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/PQueuePartitioningGridVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h b/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h
rename to src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.h b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.h
rename to src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/RefineInterGbObjectsVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h
diff --git a/cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.cpp
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.cpp
rename to src/cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.cpp
diff --git a/cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.h
similarity index 100%
rename from cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.h
rename to src/cpu/VirtualFluidsCore/Visitors/ZoltanPartitioningGridVisitor.h