diff --git a/Src/GroupTree/FGroupAttachedLeaf.hpp b/Src/GroupTree/Core/FGroupAttachedLeaf.hpp
similarity index 98%
rename from Src/GroupTree/FGroupAttachedLeaf.hpp
rename to Src/GroupTree/Core/FGroupAttachedLeaf.hpp
index 1e1736ed3d718c37199220b82ace0116020cc8d8..8b36a8b21da1b4560cf50c0736ea3d653c25f2b8 100644
--- a/Src/GroupTree/FGroupAttachedLeaf.hpp
+++ b/Src/GroupTree/Core/FGroupAttachedLeaf.hpp
@@ -4,8 +4,8 @@
 #ifndef FGROUPATTACHEDLEAF_HPP
 #define FGROUPATTACHEDLEAF_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Utils/FAssert.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Utils/FAssert.hpp"
 
 /**
  * This class is "attached" to a buffer.
diff --git a/Src/GroupTree/FGroupOfCells.hpp b/Src/GroupTree/Core/FGroupOfCells.hpp
similarity index 98%
rename from Src/GroupTree/FGroupOfCells.hpp
rename to Src/GroupTree/Core/FGroupOfCells.hpp
index 1bb25f1494bb0e74a949c86a52a477505aaaec44..8a3a3689c621aab4795e110083379faed82544ae 100644
--- a/Src/GroupTree/FGroupOfCells.hpp
+++ b/Src/GroupTree/Core/FGroupOfCells.hpp
@@ -4,10 +4,10 @@
 #ifndef FGROUPOFCELLS_HPP
 #define FGROUPOFCELLS_HPP
 
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "FStarPUDefaultAlign.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 #include <list>
 #include <functional>
diff --git a/Src/GroupTree/FGroupOfParticles.hpp b/Src/GroupTree/Core/FGroupOfParticles.hpp
similarity index 98%
rename from Src/GroupTree/FGroupOfParticles.hpp
rename to Src/GroupTree/Core/FGroupOfParticles.hpp
index f442a2b056a513113c6b2c6c7b5d56e961054869..d432ae08d7050939a379a540a9b31dd3f97570bb 100644
--- a/Src/GroupTree/FGroupOfParticles.hpp
+++ b/Src/GroupTree/Core/FGroupOfParticles.hpp
@@ -5,10 +5,10 @@
 #define FGROUPOFPARTICLES_HPP
 
 
-#include "../Utils/FAssert.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "FStarPUDefaultAlign.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 #include <list>
 #include <functional>
diff --git a/Src/GroupTree/FGroupSeqAlgorithm.hpp b/Src/GroupTree/Core/FGroupSeqAlgorithm.hpp
similarity index 98%
rename from Src/GroupTree/FGroupSeqAlgorithm.hpp
rename to Src/GroupTree/Core/FGroupSeqAlgorithm.hpp
index 61b71deb4b2ab5615fa6a9e8078ffd0ffefc0036..35e03d9d30c824cf9661fea34c515ffc8fef7a10 100644
--- a/Src/GroupTree/FGroupSeqAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupSeqAlgorithm.hpp
@@ -4,12 +4,12 @@
 #ifndef FGROUPSEQALGORITHM_HPP
 #define FGROUPSEQALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
diff --git a/Src/GroupTree/FGroupTaskAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskAlgorithm.hpp
similarity index 99%
rename from Src/GroupTree/FGroupTaskAlgorithm.hpp
rename to Src/GroupTree/Core/FGroupTaskAlgorithm.hpp
index 2e9ef0c94da193ea5cd8a418306c3b81696e696b..0972f7926242a26f431e4be39a910091d63be146 100644
--- a/Src/GroupTree/FGroupTaskAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskAlgorithm.hpp
@@ -4,12 +4,12 @@
 #ifndef FGROUPTASKALGORITHM_HPP
 #define FGROUPTASKALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
diff --git a/Src/GroupTree/FGroupTaskDepAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp
similarity index 99%
rename from Src/GroupTree/FGroupTaskDepAlgorithm.hpp
rename to Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp
index a4e514ed0e07062809e916dcf3f4119f17f9c054..a004ae8f422a15b9485061ef4ca801bacf2e6722 100644
--- a/Src/GroupTree/FGroupTaskDepAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp
@@ -5,12 +5,12 @@
 #define FGROUPTASKDEPALGORITHM_HPP
 
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
diff --git a/Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
similarity index 98%
rename from Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp
rename to Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
index d4490b82a0e0b1b63c86d7fe3d34da64c3e5f64f..a5cd0ec2151c3c13fbd1e9713d009430a442fbbe 100644
--- a/Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
@@ -3,13 +3,13 @@
 #ifndef FGROUPTASKSTARPUALGORITHM_HPP
 #define FGROUPTASKSTARPUALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
@@ -19,22 +19,22 @@
 #include <omp.h>
 
 #include <starpu.h>
-#include "FStarPUUtils.hpp"
+#include "../StarPUUtils/FStarPUUtils.hpp"
 
 #ifdef STARPU_USE_CPU
-#include "FStarPUCpuWrapper.hpp"
+#include "../StarPUUtils/FStarPUCpuWrapper.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_CUDA_KERNEL
-#include "FStarPUCudaWrapper.hpp"
-#include "Cuda/FCudaEmptyKernel.hpp"
-#include "Cuda/FCudaGroupAttachedLeaf.hpp"
-#include "Cuda/FCudaGroupOfParticles.hpp"
-#include "Cuda/FCudaGroupOfCells.hpp"
-#include "Cuda/FCudaEmptyCell.hpp"
+#include "../StarPUUtils/FStarPUCudaWrapper.hpp"
+#include "../Cuda/FCudaEmptyKernel.hpp"
+#include "../Cuda/FCudaGroupAttachedLeaf.hpp"
+#include "../Cuda/FCudaGroupOfParticles.hpp"
+#include "../Cuda/FCudaGroupOfCells.hpp"
+#include "../Cuda/FCudaEmptyCell.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
-#include "FStarPUOpenClWrapper.hpp"
-#include "OpenCl/FOpenCLDeviceWrapper.hpp"
+#include "../StarPUUtils/FStarPUOpenClWrapper.hpp"
+#include "../OpenCl/FOpenCLDeviceWrapper.hpp"
 #endif
 
 
diff --git a/Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
similarity index 99%
rename from Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp
rename to Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
index fd9f0fb21256f9073d6f358edcd72b0b57d2f4a5..b55e567fe269cd1fb0429cddd4ff9b8d8ea875f1 100644
--- a/Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
@@ -3,17 +3,17 @@
 #ifndef FGROUPTASKSTARPUMPIALGORITHM_HPP
 #define FGROUPTASKSTARPUMPIALGORITHM_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../../Utils/FMpi.hpp"
 
 #include "FOutOfBlockInteraction.hpp"
 
@@ -24,21 +24,21 @@
 
 #include <starpu.h>
 #include <starpu_mpi.h>
-#include "FStarPUUtils.hpp"
+#include "../StarPUUtils/FStarPUUtils.hpp"
 
 #ifdef STARPU_USE_CPU
-#include "FStarPUCpuWrapper.hpp"
+#include "../StarPUUtils/FStarPUCpuWrapper.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_CUDA_KERNEL
-#include "FStarPUCudaWrapper.hpp"
-#include "Cuda/FCudaEmptyKernel.hpp"
-#include "Cuda/FCudaGroupAttachedLeaf.hpp"
-#include "Cuda/FCudaGroupOfParticles.hpp"
-#include "Cuda/FCudaGroupOfCells.hpp"
+#include "../StarPUUtils/FStarPUCudaWrapper.hpp"
+#include "../Cuda/FCudaEmptyKernel.hpp"
+#include "../Cuda/FCudaGroupAttachedLeaf.hpp"
+#include "../Cuda/FCudaGroupOfParticles.hpp"
+#include "../Cuda/FCudaGroupOfCells.hpp"
 #endif
 #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
-#include "FStarPUOpenClWrapper.hpp"
-#include "OpenCl/FOpenCLDeviceWrapper.hpp"
+#include "../StarPUUtils/FStarPUOpenClWrapper.hpp"
+#include "../OpenCl/FOpenCLDeviceWrapper.hpp"
 #endif
 
 
diff --git a/Src/GroupTree/FGroupTree.hpp b/Src/GroupTree/Core/FGroupTree.hpp
similarity index 99%
rename from Src/GroupTree/FGroupTree.hpp
rename to Src/GroupTree/Core/FGroupTree.hpp
index e635941d1a8516401555ded4bf5dffe832b935aa..e88e78557a7c8a459aa5d1c4928bf81f5344a0c3 100644
--- a/Src/GroupTree/FGroupTree.hpp
+++ b/Src/GroupTree/Core/FGroupTree.hpp
@@ -6,10 +6,10 @@
 #include <vector>
 #include <functional>
 
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FPoint.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FPoint.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
 
 #include "FGroupOfCells.hpp"
 #include "FGroupOfParticles.hpp"
diff --git a/Src/GroupTree/FOutOfBlockInteraction.hpp b/Src/GroupTree/Core/FOutOfBlockInteraction.hpp
similarity index 82%
rename from Src/GroupTree/FOutOfBlockInteraction.hpp
rename to Src/GroupTree/Core/FOutOfBlockInteraction.hpp
index b3164d733f2075222e4ffa7b846be0276f24e98b..175773e3973670976b8a4a39e0196fc074df20e3 100644
--- a/Src/GroupTree/FOutOfBlockInteraction.hpp
+++ b/Src/GroupTree/Core/FOutOfBlockInteraction.hpp
@@ -1,9 +1,9 @@
 #ifndef FOUTOFBLOCKINTERACTION_HPP
 #define FOUTOFBLOCKINTERACTION_HPP
 
-#include "../Utils/FGlobal.hpp"
+#include "../../Utils/FGlobal.hpp"
 
-#include "FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 struct  alignas(FStarPUDefaultAlign::StructAlign) OutOfBlockInteraction{
     MortonIndex outIndex;
diff --git a/Src/GroupTree/FP2PGroupParticleContainer.hpp b/Src/GroupTree/Core/FP2PGroupParticleContainer.hpp
similarity index 100%
rename from Src/GroupTree/FP2PGroupParticleContainer.hpp
rename to Src/GroupTree/Core/FP2PGroupParticleContainer.hpp
diff --git a/Src/GroupTree/Cuda/FCudaDeviceWrapper.hpp b/Src/GroupTree/Cuda/FCudaDeviceWrapper.hpp
index a56fea94b3e56fa9e8fb601c9e59c4e0988e9e74..7efbaa5e0fc1057da0aa4ee143573a7023f11cd3 100644
--- a/Src/GroupTree/Cuda/FCudaDeviceWrapper.hpp
+++ b/Src/GroupTree/Cuda/FCudaDeviceWrapper.hpp
@@ -4,7 +4,7 @@
 
 
 #include "../../Utils/FGlobal.hpp"
-#include "../FOutOfBlockInteraction.hpp"
+#include "../Core/FOutOfBlockInteraction.hpp"
 #include "FCudaStructParams.hpp"
 
 template <class CellClass, class CellContainerClass, class ParticleContainerGroupClass, class ParticleGroupClass, class CudaKernelClass>
diff --git a/Src/GroupTree/Cuda/FCudaEmptyCell.hpp b/Src/GroupTree/Cuda/FCudaEmptyCell.hpp
index 7497b19c2371a62a7f7becc4bbdb42057d36b2d3..83834d504ddb1e8184828f8806cfc74f01638846 100644
--- a/Src/GroupTree/Cuda/FCudaEmptyCell.hpp
+++ b/Src/GroupTree/Cuda/FCudaEmptyCell.hpp
@@ -3,7 +3,7 @@
 
 #include "../../Utils/FGlobal.hpp"
 #include "../../Containers/FTreeCoordinate.hpp"
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 struct alignas(FStarPUDefaultAlign::StructAlign) FCudaEmptyCell {
     MortonIndex mortonIndex;
diff --git a/Src/GroupTree/Cuda/FCudaGroupOfCells.hpp b/Src/GroupTree/Cuda/FCudaGroupOfCells.hpp
index 8aa578b4b0a1135829d3ca8afa1077e2c24b0368..c6d56210c54916b0822845837918a0af1dea18ab 100644
--- a/Src/GroupTree/Cuda/FCudaGroupOfCells.hpp
+++ b/Src/GroupTree/Cuda/FCudaGroupOfCells.hpp
@@ -4,7 +4,7 @@
 
 #include "FCudaGlobal.hpp"
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 /**
 * @brief The FCudaGroupOfCells class manages the cells in block allocation.
diff --git a/Src/GroupTree/Cuda/FCudaGroupOfParticles.hpp b/Src/GroupTree/Cuda/FCudaGroupOfParticles.hpp
index 65015ef12d9cdde3cda23fe3455dc26f761818d0..b5ac906ae40d484943106c0afda337051b4ac03a 100644
--- a/Src/GroupTree/Cuda/FCudaGroupOfParticles.hpp
+++ b/Src/GroupTree/Cuda/FCudaGroupOfParticles.hpp
@@ -3,7 +3,7 @@
 #define FCUDAGROUPOFPARTICLES_HPP
 
 #include "FCudaGlobal.hpp"
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 template <unsigned NbAttributesPerParticle, class AttributeClass = FReal>
 class FCudaGroupOfParticles {
diff --git a/Src/GroupTree/Cuda/FCudaStructParams.hpp b/Src/GroupTree/Cuda/FCudaStructParams.hpp
index 86d78b00f1653cecc6fa06ef9f79d7e16ef5075a..5d161565cf689e97fe71caff4d46438db9492934 100644
--- a/Src/GroupTree/Cuda/FCudaStructParams.hpp
+++ b/Src/GroupTree/Cuda/FCudaStructParams.hpp
@@ -2,7 +2,7 @@
 #ifndef FCUDASTRUCTPARAMS_HPP
 #define FCUDASTRUCTPARAMS_HPP
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 #include "FCudaGlobal.hpp"
 
 template <class ArrayType, const int Size>
diff --git a/Src/GroupTree/OpenCl/FEmptyOpenCLCode.hpp b/Src/GroupTree/OpenCl/FEmptyOpenCLCode.hpp
index a972e0ed009c71df7c9e1446a02e772f7f1e251c..fdec6da0c2369ab54caedcde5bba5dffbb683e0e 100644
--- a/Src/GroupTree/OpenCl/FEmptyOpenCLCode.hpp
+++ b/Src/GroupTree/OpenCl/FEmptyOpenCLCode.hpp
@@ -4,7 +4,7 @@
 
 // Return the same thing as FEmptyKernel.cl
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 class FEmptyOpenCLCode{
 
diff --git a/Src/GroupTree/OpenCl/FOpenCLDeviceWrapper.hpp b/Src/GroupTree/OpenCl/FOpenCLDeviceWrapper.hpp
index 72f168a0dc597cc49548fc61cb453f20329fe943..832f6fb48741f30d70e232c4ca7952d44b37c86d 100644
--- a/Src/GroupTree/OpenCl/FOpenCLDeviceWrapper.hpp
+++ b/Src/GroupTree/OpenCl/FOpenCLDeviceWrapper.hpp
@@ -12,11 +12,11 @@
 #include "../../Utils/FAlignedMemory.hpp"
 #include "../../Utils/FAssert.hpp"
 
-#include "../FOutOfBlockInteraction.hpp"
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #include "FEmptyOpenCLCode.hpp"
 
-#include "../FStarPUDefaultAlign.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 #include <starpu.h>
 
diff --git a/Src/GroupTree/FStarPUCpuWrapper.hpp b/Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp
similarity index 98%
rename from Src/GroupTree/FStarPUCpuWrapper.hpp
rename to Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp
index 9910dbdc6e66ce7d765e3aa4ecbfaaed2c11e032..b56a69e2695adc15c1cfe61787ee78704eb03554 100644
--- a/Src/GroupTree/FStarPUCpuWrapper.hpp
+++ b/Src/GroupTree/StarPUUtils/FStarPUCpuWrapper.hpp
@@ -4,20 +4,20 @@
 #define FSTARPUCPUWRAPPER_HPP
 
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "FOutOfBlockInteraction.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #ifdef ScalFMM_USE_MPI
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FMpi.hpp"
 #endif
 
 #include <vector>
diff --git a/Src/GroupTree/FStarPUCudaWrapper.hpp b/Src/GroupTree/StarPUUtils/FStarPUCudaWrapper.hpp
similarity index 97%
rename from Src/GroupTree/FStarPUCudaWrapper.hpp
rename to Src/GroupTree/StarPUUtils/FStarPUCudaWrapper.hpp
index a6a954a273e8e9c1810c75352bb327d202aed17c..ea56a49268b59ecc646da4a02234ddb18a9e502c 100644
--- a/Src/GroupTree/FStarPUCudaWrapper.hpp
+++ b/Src/GroupTree/StarPUUtils/FStarPUCudaWrapper.hpp
@@ -2,20 +2,20 @@
 #ifndef FSTARPUCUDAWRAPPER_HPP
 #define FSTARPUCUDAWRAPPER_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "FOutOfBlockInteraction.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #ifdef ScalFMM_USE_MPI
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FMpi.hpp"
 #endif
 
 #include <vector>
@@ -29,7 +29,7 @@
 #include <starpu_mpi.h>
 #endif
 
-#include "Cuda/FCudaDeviceWrapper.hpp"
+#include "../Cuda/FCudaDeviceWrapper.hpp"
 
 #include "FStarPUUtils.hpp"
 
diff --git a/Src/GroupTree/FStarPUDefaultAlign.hpp b/Src/GroupTree/StarPUUtils/FStarPUDefaultAlign.hpp
similarity index 100%
rename from Src/GroupTree/FStarPUDefaultAlign.hpp
rename to Src/GroupTree/StarPUUtils/FStarPUDefaultAlign.hpp
diff --git a/Src/GroupTree/FStarPUKernelCapacities.hpp b/Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp
similarity index 100%
rename from Src/GroupTree/FStarPUKernelCapacities.hpp
rename to Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp
diff --git a/Src/GroupTree/FStarPUOpenClWrapper.hpp b/Src/GroupTree/StarPUUtils/FStarPUOpenClWrapper.hpp
similarity index 97%
rename from Src/GroupTree/FStarPUOpenClWrapper.hpp
rename to Src/GroupTree/StarPUUtils/FStarPUOpenClWrapper.hpp
index bd78954dac0b62af883e6838a6ef6d933de1467f..f77f0ba31b6d92915ea11c757632c76d2d562a12 100644
--- a/Src/GroupTree/FStarPUOpenClWrapper.hpp
+++ b/Src/GroupTree/StarPUUtils/FStarPUOpenClWrapper.hpp
@@ -5,20 +5,20 @@
 #define FSTARPUOPENCLWRAPPER_HPP
 
 
-#include "../Utils/FGlobal.hpp"
-#include "../Core/FCoreCommon.hpp"
-#include "../Utils/FQuickSort.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "../Utils/FLog.hpp"
-#include "../Utils/FTic.hpp"
-#include "../Utils/FAssert.hpp"
-#include "../Utils/FAlignedMemory.hpp"
-#include "../Utils/FAssert.hpp"
-
-#include "FOutOfBlockInteraction.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Core/FCoreCommon.hpp"
+#include "../../Utils/FQuickSort.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../../Utils/FLog.hpp"
+#include "../../Utils/FTic.hpp"
+#include "../../Utils/FAssert.hpp"
+#include "../../Utils/FAlignedMemory.hpp"
+#include "../../Utils/FAssert.hpp"
+
+#include "../Core/FOutOfBlockInteraction.hpp"
 
 #ifdef ScalFMM_USE_MPI
-#include "../Utils/FMpi.hpp"
+#include "../../Utils/FMpi.hpp"
 #endif
 
 #include <vector>
diff --git a/Src/GroupTree/FStarPUUtils.hpp b/Src/GroupTree/StarPUUtils/FStarPUUtils.hpp
similarity index 98%
rename from Src/GroupTree/FStarPUUtils.hpp
rename to Src/GroupTree/StarPUUtils/FStarPUUtils.hpp
index cc6ea017e13498c3038bb62063f44a3706175b84..40e33e3f0146219337b45b3db1d223f479e40b8a 100644
--- a/Src/GroupTree/FStarPUUtils.hpp
+++ b/Src/GroupTree/StarPUUtils/FStarPUUtils.hpp
@@ -4,7 +4,7 @@
 #define FSTARPUUTILS_HPP
 
 /////////////////////////////////////////////////////
-#include "../Utils/FGlobal.hpp"
+#include "../../Utils/FGlobal.hpp"
 
 /////////////////////////////////////////////////////
 
diff --git a/Src/GroupTree/Cuda/FCudaTestKernels.hpp b/Src/GroupTree/TestKernel/FCudaTestKernels.hpp
similarity index 99%
rename from Src/GroupTree/Cuda/FCudaTestKernels.hpp
rename to Src/GroupTree/TestKernel/FCudaTestKernels.hpp
index ef4d9cd8cdb93ccd10a21ed65ea0e2113c443b3e..1ffb5fcf1a3e3465f979433bf6d9a40c7d3819d2 100644
--- a/Src/GroupTree/Cuda/FCudaTestKernels.hpp
+++ b/Src/GroupTree/TestKernel/FCudaTestKernels.hpp
@@ -2,7 +2,7 @@
 #ifndef FCUDATESTKERNEL_HPP
 #define FCUDATESTKERNEL_HPP
 
-#include "FCudaGlobal.hpp"
+#include "../Cuda/FCudaGlobal.hpp"
 
 // We need to describe this cell
 #include "../../Components/FTestCell.hpp"
diff --git a/Src/GroupTree/FGroupTestParticleContainer.hpp b/Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp
similarity index 95%
rename from Src/GroupTree/FGroupTestParticleContainer.hpp
rename to Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp
index 1923eb64ae8246d14d101a118ff065d5fcf10934..3c85dae64fcf219e1cfacd212303a68ddffe546b 100644
--- a/Src/GroupTree/FGroupTestParticleContainer.hpp
+++ b/Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp
@@ -4,7 +4,7 @@
 #ifndef FGROUPTESTPARTICLECONTAINER_HPP
 #define FGROUPTESTPARTICLECONTAINER_HPP
 
-#include "FGroupAttachedLeaf.hpp"
+#include "../Core/FGroupAttachedLeaf.hpp"
 
 class FGroupTestParticleContainer : public FGroupAttachedLeaf<2, long long int> {
     typedef FGroupAttachedLeaf<2, long long int> Parent;
diff --git a/Src/GroupTree/FTestCellPOD.hpp b/Src/GroupTree/TestKernel/FTestCellPOD.hpp
similarity index 96%
rename from Src/GroupTree/FTestCellPOD.hpp
rename to Src/GroupTree/TestKernel/FTestCellPOD.hpp
index c253dae551caa54afec12e67dc6de8a91dc4e065..3f88fa1501d99d8f7d1bc4e66396c9210a20cd32 100644
--- a/Src/GroupTree/FTestCellPOD.hpp
+++ b/Src/GroupTree/TestKernel/FTestCellPOD.hpp
@@ -2,9 +2,9 @@
 #ifndef FTESTCELLPOD_HPP
 #define FTESTCELLPOD_HPP
 
-#include "../Utils/FGlobal.hpp"
-#include "../Containers/FTreeCoordinate.hpp"
-#include "FStarPUDefaultAlign.hpp"
+#include "../../Utils/FGlobal.hpp"
+#include "../../Containers/FTreeCoordinate.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
 
 struct alignas(FStarPUDefaultAlign::StructAlign) FTestCellPODCore {
     MortonIndex mortonIndex;
diff --git a/Src/GroupTree/OpenCl/FTestKernel.cl b/Src/GroupTree/TestKernel/FTestKernel.cl
similarity index 100%
rename from Src/GroupTree/OpenCl/FTestKernel.cl
rename to Src/GroupTree/TestKernel/FTestKernel.cl
diff --git a/Src/GroupTree/OpenCl/FTestOpenCLCode.hpp b/Src/GroupTree/TestKernel/FTestOpenCLCode.hpp
similarity index 93%
rename from Src/GroupTree/OpenCl/FTestOpenCLCode.hpp
rename to Src/GroupTree/TestKernel/FTestOpenCLCode.hpp
index 748c233698bda39caf0e9fa4a60f0577c8a0a1d1..45ad2036eb089cdf7fd7d4cfc04ca2bc6092baf4 100644
--- a/Src/GroupTree/OpenCl/FTestOpenCLCode.hpp
+++ b/Src/GroupTree/TestKernel/FTestOpenCLCode.hpp
@@ -2,8 +2,8 @@
 #define FTESTOPENCLCODE_HPP
 
 #include "../../Utils/FGlobal.hpp"
-#include "../FStarPUDefaultAlign.hpp"
-#include "FTextReplacer.hpp"
+#include "../StarPUUtils/FStarPUDefaultAlign.hpp"
+#include "../OpenCl/FTextReplacer.hpp"
 
 // Initialize the types
 class FTestOpenCLCode{
diff --git a/Tests/noDist/testBlockedAlgorithm.cpp b/Tests/noDist/testBlockedAlgorithm.cpp
index 4468ebf33ef4bd26957ca68d0637dcf96d951533..05d458bd88ecffe6549386f564430407f7d9d75a 100644
--- a/Tests/noDist/testBlockedAlgorithm.cpp
+++ b/Tests/noDist/testBlockedAlgorithm.cpp
@@ -5,7 +5,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -18,23 +18,23 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
 #ifdef ScalFMM_USE_OMP4
-#include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
 #endif
 #ifdef ScalFMM_USE_STARPU
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 #endif
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../../Src/GroupTree/FGroupTestParticleContainer.hpp"
+#include "../../Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp"
 
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 #include "../../Src/Core/FFmmAlgorithm.hpp"
diff --git a/Tests/noDist/testBlockedChebyshev.cpp b/Tests/noDist/testBlockedChebyshev.cpp
index a610cc4307be2ad5b5fd3ac6e0d44f5cb655b37f..5d1fefbfde92f12c56c715fdf7b38568e7ce8e11 100644
--- a/Tests/noDist/testBlockedChebyshev.cpp
+++ b/Tests/noDist/testBlockedChebyshev.cpp
@@ -7,7 +7,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -25,23 +25,22 @@
 #include "../../Src/Files/FRandomLoader.hpp"
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 #ifdef ScalFMM_USE_OMP4
-#include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
 #endif
 #ifdef ScalFMM_USE_STARPU
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 #endif
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 
diff --git a/Tests/noDist/testBlockedMpiAlgorithm.cpp b/Tests/noDist/testBlockedMpiAlgorithm.cpp
index 45c12199b0b3c9cca9da83e50f0addbb16eab30c..483d1fa89ed4cfb001440bedaaed419f748ab408 100644
--- a/Tests/noDist/testBlockedMpiAlgorithm.cpp
+++ b/Tests/noDist/testBlockedMpiAlgorithm.cpp
@@ -7,7 +7,7 @@
 #include "../../Src/Utils/FGlobal.hpp"
 #include "../../Src/Utils/FMpi.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -20,24 +20,23 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../Src/GroupTree/FGroupTestParticleContainer.hpp"
 
 #include "../../Src/BalanceTree/FLeafBalance.hpp"
 #include "../../Src/Files/FMpiTreeBuilder.hpp"
 
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 
 
 int getTreeCoordinate(const FReal inRelativePosition, const FReal boxWidth,
diff --git a/Tests/noDist/testBlockedMpiChebyshev.cpp b/Tests/noDist/testBlockedMpiChebyshev.cpp
index 3baaea5020fcb9cea9363355b1ff58c1bc0afa37..8592549ed3e56587f374b096e4d637316f0e5228 100644
--- a/Tests/noDist/testBlockedMpiChebyshev.cpp
+++ b/Tests/noDist/testBlockedMpiChebyshev.cpp
@@ -9,7 +9,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -27,25 +27,24 @@
 #include "../../Src/Files/FRandomLoader.hpp"
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
 #include "../../Src/Files/FMpiTreeBuilder.hpp"
-#include "../../Src/GroupTree/FGroupTaskStarpuMpiAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp"
 
 #include "../../Src/Files/FMpiFmaGenericLoader.hpp"
 
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 
 #include <memory>
 
diff --git a/Tests/noDist/testBlockedRotation.cpp b/Tests/noDist/testBlockedRotation.cpp
index 5032adce329f4ff7db8ecd684fca1fa562715a64..d2630c3f5ce2209e6e9fe0295ac4e812407c30fa 100644
--- a/Tests/noDist/testBlockedRotation.cpp
+++ b/Tests/noDist/testBlockedRotation.cpp
@@ -4,7 +4,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -21,23 +21,22 @@
 #include "../../Src/Files/FRandomLoader.hpp"
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 #ifdef ScalFMM_USE_OMP4
-#include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
 #endif
 #ifdef ScalFMM_USE_STARPU
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 #endif
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../Src/GroupTree/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 
diff --git a/Tests/noDist/testBlockedTree.cpp b/Tests/noDist/testBlockedTree.cpp
index 1f3254a3083353da5b4df6961843deba8e2f435e..7e5337dcc9a1d2e4809378fd55e60d0f992f5d87 100644
--- a/Tests/noDist/testBlockedTree.cpp
+++ b/Tests/noDist/testBlockedTree.cpp
@@ -4,7 +4,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -28,16 +28,16 @@
 
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 #ifdef ScalFMM_USE_OMP4
-#include "../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskDepAlgorithm.hpp"
 #endif
 #ifdef ScalFMM_USE_STARPU
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 #endif
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
diff --git a/Tests/noDist/testBlockedWithCudaAlgorithm.cpp b/Tests/noDist/testBlockedWithCudaAlgorithm.cpp
index 83d33c512f7b3c314d5af3a274edfbca5466608e..e3b5ef16066cc2d639006772efa1bc2556b48ae8 100644
--- a/Tests/noDist/testBlockedWithCudaAlgorithm.cpp
+++ b/Tests/noDist/testBlockedWithCudaAlgorithm.cpp
@@ -7,7 +7,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -20,26 +20,26 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../../Src/GroupTree/FGroupTestParticleContainer.hpp"
+#include "../../Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp"
 
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
 
-#include "../../Src/GroupTree/FTestCellPOD.hpp"
+#include "../../Src/GroupTree/TestKernel/FTestCellPOD.hpp"
 
 //#include "../../Src/GroupTree/Cuda/FCudaTestKernels.hpp"
 //#include "../../Src/GroupTree/Cuda/FCudaGroupOfParticles.hpp"
diff --git a/Tests/noDist/testBlockedWithOpenCLAlgorithm.cpp b/Tests/noDist/testBlockedWithOpenCLAlgorithm.cpp
index 7fd11b9c2b5659acba01dd4e548f603acd468193..c5059dbdb806cb433153a71197a986f1c66d1c95 100644
--- a/Tests/noDist/testBlockedWithOpenCLAlgorithm.cpp
+++ b/Tests/noDist/testBlockedWithOpenCLAlgorithm.cpp
@@ -6,7 +6,7 @@
 
 #include "../../Src/Utils/FGlobal.hpp"
 
-#include "../../Src/GroupTree/FGroupTree.hpp"
+#include "../../Src/GroupTree/Core/FGroupTree.hpp"
 
 #include "../../Src/Components/FSimpleLeaf.hpp"
 #include "../../Src/Containers/FVector.hpp"
@@ -19,26 +19,26 @@
 
 #include "../../Src/Files/FRandomLoader.hpp"
 
-#include "../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupSeqAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
-#include "../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
+#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
+#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
 
 #include "../../Src/Utils/FParameterNames.hpp"
 
 #include "../../Src/Components/FTestParticleContainer.hpp"
 #include "../../Src/Components/FTestCell.hpp"
 #include "../../Src/Components/FTestKernels.hpp"
-#include "../../Src/GroupTree/FGroupTestParticleContainer.hpp"
+#include "../../Src/GroupTree/TestKernel/FGroupTestParticleContainer.hpp"
 
 #include "../../Src/Files/FFmaGenericLoader.hpp"
 #include "../../Src/Core/FFmmAlgorithm.hpp"
 
-#include "../../Src/GroupTree/FStarPUKernelCapacities.hpp"
-#include "../../Src/GroupTree/OpenCl/FTestOpenCLCode.hpp"
-#include "../../Src/GroupTree/FTestCellPOD.hpp"
+#include "../../Src/GroupTree/StarPUUtils/FStarPUKernelCapacities.hpp"
+#include "../../Src/GroupTree/TestKernel/FTestOpenCLCode.hpp"
+#include "../../Src/GroupTree/TestKernel/FTestCellPOD.hpp"
 
 
 int main(int argc, char* argv[]){