diff --git a/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp b/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp
index e7e9e48dba8ad7485a2ef4c90cdde5cd813d2923..70288317d923f2ea786acf6350a7fb539a3b2457 100644
--- a/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp
+++ b/src/gpu/VirtualFluids_GPU/Init/InitLattice.cpp
@@ -33,7 +33,7 @@
 #include "Init/InitLattice.h"
 #include "Parameter/Parameter.h"
 #include "GPU/GPU_Interface.h"
-#include "AdvectionDiffusion/ADKernelManager.h"
+#include "KernelManager/ADKernelManager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 void initLattice(SPtr<Parameter> para, ADKernelManager* adKernelManager)
diff --git a/src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.cpp
similarity index 99%
rename from src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.cpp
rename to src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.cpp
index 7f7697f70d1e216575a9a84f424507d6a461c489..a54c59753e43920b60867ee8c539a3fc2f8b19ef 100644
--- a/src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.cpp
@@ -30,7 +30,7 @@
 //! \ingroup AdvectionDiffusion
 //! \author Martin Schoenherr
 //=======================================================================================
-#include "AdvectionDiffusion/ADKernelManager.h"
+#include "KernelManager/ADKernelManager.h"
 #include "GPU/CudaMemoryManager.h"
 #include "GPU/GPU_Interface.h"
 #include "Parameter/Parameter.h"
diff --git a/src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/AdvectionDiffusion/ADKernelManager.h
rename to src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h
diff --git a/src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp
similarity index 99%
rename from src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp
rename to src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp
index 2af46edcfa4d0d846637fe1025cda152f229c751..d82f27e20dca51426844a9d1c2be4d614e4fc447 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.cpp
@@ -33,7 +33,7 @@
 #include <cuda_runtime.h>
 #include <helper_cuda.h>
 #include "LBKernelManager.h"
-#include "GPU_Interface.h"
+#include "GPU/GPU_Interface.h"
 #include <Parameter/Parameter.h>
 
 
diff --git a/src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/GPU/LBKernelManager.h
rename to src/gpu/VirtualFluids_GPU/KernelManager/LBKernelManager.h
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 5b3c13e51a9dad8ac122d8d356f059429c96228e..be0e09a7fe7d25f310a1262810b86ec75ef4465b 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -32,8 +32,8 @@
 //=======================================================================================
 #include "Simulation.h"
 #include "DataStructureInitializer/GridProvider.h"
-#include "GPU/LBKernelManager.h"
-#include "AdvectionDiffusion/ADKernelManager.h"
+#include "KernelManager/LBKernelManager.h"
+#include "KernelManager/ADKernelManager.h"
 #include "GPU/CudaMemoryManager.h"
 #include "GPU/devCheck.h"
 #include "Init/InitLattice.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
index 71bf3cd60a1ee899ff45201da6749ef0e92b5857..989d9f0be767914ce5bdc4822f225bb2de256b21 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
@@ -34,8 +34,8 @@
 #include "GPU/CudaMemoryManager.h"
 #include "Parameter/Parameter.h"
 #include "basics/writer/WbWriterVtkXmlBinary.h"
-#include "AdvectionDiffusion/ADKernelManager.h"
-#include "GPU/LBKernelManager.h"
+#include "KernelManager/ADKernelManager.h"
+#include "KernelManager/LBKernelManager.h"
 
 void FileWriter::writeInit(SPtr<Parameter> para, SPtr<CudaMemoryManager> cudaMemoryManager, SPtr<LBKernelManager> cudaKernelManager, ADKernelManager* adKernelManager)
 {