diff --git a/Tests/Kernels/testSphericalAlgorithm.cpp b/Tests/Kernels/testSphericalAlgorithm.cpp
index 5a25b2dd3ba7d794110ea9ca8b6d737a203fa6b7..3a5d5a93ee4ab1bf441e19e63b77492f14542ad1 100644
--- a/Tests/Kernels/testSphericalAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalAlgorithm.cpp
@@ -14,22 +14,22 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
-#include "../Src/Core/FFmmAlgorithmTask.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmTask.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Files/FFmaLoader.hpp"
+#include "../../Src/Files/FFmaLoader.hpp"
 
 
 /** This program show an example of use of
diff --git a/Tests/Kernels/testSphericalBlasAlgorithm.cpp b/Tests/Kernels/testSphericalBlasAlgorithm.cpp
index 87c0103d0271a70d4bb1ff8cd2933b1d1ad979be..54429c49aaa88b09e4052f24a2faede8828933b2 100644
--- a/Tests/Kernels/testSphericalBlasAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalBlasAlgorithm.cpp
@@ -18,24 +18,24 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
-#include "../Src/Core/FFmmAlgorithmTask.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmTask.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalBlasKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalBlasKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Files/FFmaScanfLoader.hpp"
+#include "../../Src/Files/FFmaScanfLoader.hpp"
 
 /** This program show an example of use of
   * the fmm blas algo
diff --git a/Tests/Kernels/testSphericalBlockBlasAlgorithm.cpp b/Tests/Kernels/testSphericalBlockBlasAlgorithm.cpp
index 0000d074fa3ba18e9852c9b8ee9d258bb70a8446..9aae3b724530b1375e6c8d2cdeeadc11ba00ba9d 100644
--- a/Tests/Kernels/testSphericalBlockBlasAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalBlockBlasAlgorithm.cpp
@@ -18,24 +18,24 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
-#include "../Src/Core/FFmmAlgorithmTask.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmTask.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
 
-#include "../Src/Files/FFmaScanfLoader.hpp"
+#include "../../Src/Files/FFmaScanfLoader.hpp"
 
 /** This program show an example of use of
   * the fmm basic algo
diff --git a/Tests/Kernels/testSphericalEwalAlgorithm.cpp b/Tests/Kernels/testSphericalEwalAlgorithm.cpp
index feae9f827a50e11dd51fdbe30e611d632abe1c55..d4a200bfdd34a07e7fa7f7b79ceaadec111f1d3d 100644
--- a/Tests/Kernels/testSphericalEwalAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalEwalAlgorithm.cpp
@@ -14,20 +14,20 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithmPeriodic.hpp"
+#include "../../Src/Core/FFmmAlgorithmPeriodic.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Files/FEwalLoader.hpp"
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Files/FEwalLoader.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
 /** Ewal particle is used in the gadget program
   * here we try to make the same simulation
diff --git a/Tests/Kernels/testSphericalGalaxyCsv.cpp b/Tests/Kernels/testSphericalGalaxyCsv.cpp
index a014a7825785e56d5b47ef9b0ad34f4fe2af7d87..ff3e138e2f009ba9c3bb576b6ec90b281c529287 100644
--- a/Tests/Kernels/testSphericalGalaxyCsv.cpp
+++ b/Tests/Kernels/testSphericalGalaxyCsv.cpp
@@ -14,26 +14,26 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Extensions/FExtendVelocity.hpp"
+#include "../../Src/Extensions/FExtendVelocity.hpp"
 
-#include "../Src/Files/FTreeCsvSaver.hpp"
-#include "../Src/Files/FFmaLoader.hpp"
-#include "../Src/Arranger/FOctreeArranger.hpp"
+#include "../../Src/Files/FTreeCsvSaver.hpp"
+#include "../../Src/Files/FFmaLoader.hpp"
+#include "../../Src/Arranger/FOctreeArranger.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
 class FmmVeloParticle : public FSphericalParticle, public FExtendVelocity {
 };
diff --git a/Tests/Kernels/testSphericalProcAlgorithm.cpp b/Tests/Kernels/testSphericalProcAlgorithm.cpp
index 3c1e72acbc33a79c9be1e3245d81f6750ffd0eaf..3f0a7721d40dbae996a943ffc20822d4c3e57b20 100644
--- a/Tests/Kernels/testSphericalProcAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalProcAlgorithm.cpp
@@ -13,26 +13,26 @@
 // @FUSE_MPI
 // ================
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FMpi.hpp"
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FMath.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FMpi.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FMath.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Core/FFmmAlgorithmThreadProc.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Files/FMpiFmaLoader.hpp"
-#include "../Src/Files/FMpiTreeBuilder.hpp"
-#include "../Src/Files/FFmaBinLoader.hpp"
+#include "../../Src/Files/FMpiFmaLoader.hpp"
+#include "../../Src/Files/FMpiTreeBuilder.hpp"
+#include "../../Src/Files/FFmaBinLoader.hpp"
 
 #include <iostream>
 
diff --git a/Tests/Kernels/testSphericalRotationAlgorithm.cpp b/Tests/Kernels/testSphericalRotationAlgorithm.cpp
index adff865e732af78c243596de6c66470543b2635f..c0e13594e165170d21a5554cfc1cd876ff1d80ea 100644
--- a/Tests/Kernels/testSphericalRotationAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalRotationAlgorithm.cpp
@@ -14,23 +14,23 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
-#include "../Src/Core/FFmmAlgorithmTask.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmTask.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalRotationKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalRotationKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Files/FFmaScanfLoader.hpp"
+#include "../../Src/Files/FFmaScanfLoader.hpp"
 
 /** This program show an example of use of
   * the fmm basic algo
diff --git a/Tests/Kernels/testSphericalTsmAlgorithm.cpp b/Tests/Kernels/testSphericalTsmAlgorithm.cpp
index da047c05cde74aa8ff2308197ed49f04010a3334..10fd2990ae5868cd84c889d16057d11a98fa82ad 100644
--- a/Tests/Kernels/testSphericalTsmAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalTsmAlgorithm.cpp
@@ -14,21 +14,21 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Components/FTypedLeaf.hpp"
+#include "../../Src/Components/FTypedLeaf.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Core/FFmmAlgorithmTsm.hpp"
+#include "../../Src/Core/FFmmAlgorithmTsm.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Files/FFmaTsmLoader.hpp"
+#include "../../Src/Files/FFmaTsmLoader.hpp"
 
 /** This program show an example of use of
   * the fmm basic algo
diff --git a/Tests/Kernels/testSphericalTsmNoTsm.cpp b/Tests/Kernels/testSphericalTsmNoTsm.cpp
index 5bb414f85b3fc71ca8adac391501a8a63787adcd..5c226f2f37dc449b51a3aeedbec898b75445feea 100644
--- a/Tests/Kernels/testSphericalTsmNoTsm.cpp
+++ b/Tests/Kernels/testSphericalTsmNoTsm.cpp
@@ -14,23 +14,23 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmTsm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
-#include "../Src/Core/FFmmAlgorithmThreadTsm.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmTsm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmThreadTsm.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
-#include "../Src/Components/FTypedLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FTypedLeaf.hpp"
 
 
 /** This program show an example of use of
diff --git a/Tests/Utils/testBlas.cpp b/Tests/Utils/testBlas.cpp
index 2b6472d9529388e31f8deede783c4746cb94b1df..1f4a8c15ce8c389a488a95f81fdb595b4bf97293 100644
--- a/Tests/Utils/testBlas.cpp
+++ b/Tests/Utils/testBlas.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "../Src/Utils/FBlas.hpp"
+#include "../../Src/Utils/FBlas.hpp"
 
 FReal FRandom() { return (FReal(rand()) / FReal(RAND_MAX)); }
 
diff --git a/Tests/Utils/testDebug.cpp b/Tests/Utils/testDebug.cpp
index 70df84f339ef9c21a4051feaf0a79499f3669ed3..5d31e742cd60695cfd1d29aa3bc02629bab2ff35 100644
--- a/Tests/Utils/testDebug.cpp
+++ b/Tests/Utils/testDebug.cpp
@@ -8,7 +8,7 @@
 // Owners: INRIA.
 // Copyright © 2011-2012, spread under the terms and conditions of a proprietary license.
 // ===================================================================================
-#include "../Src/Utils/FDebug.hpp"
+#include "../../Src/Utils/FDebug.hpp"
 
 /**
 * In this file we show how to use the debug module.
diff --git a/Tests/Utils/testFmmAlgorithm.cpp b/Tests/Utils/testFmmAlgorithm.cpp
index 76ec7b955f7189856a5440723c4a3c5459c85518..b08fe13326ac2d6387bd44a235f7f142039a7aeb 100644
--- a/Tests/Utils/testFmmAlgorithm.cpp
+++ b/Tests/Utils/testFmmAlgorithm.cpp
@@ -13,27 +13,27 @@
 #include <cstdio>
 
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
-#include "../Src/Core/FFmmAlgorithmTask.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmTask.hpp"
 
-#include "../Src/Components/FBasicKernels.hpp"
+#include "../../Src/Components/FBasicKernels.hpp"
 
-#include "../Src/Files/FRandomLoader.hpp"
+#include "../../Src/Files/FRandomLoader.hpp"
 
 
 /** This program show an example of use of the fmm basic algo
diff --git a/Tests/Utils/testFmmAlgorithmPeriodic.cpp b/Tests/Utils/testFmmAlgorithmPeriodic.cpp
index cdd6e0db2fe6ca5166c34b094a0a9f2a2b66b91f..940dd90c7b32c65a757b8eeb7c492f0164bbf903 100644
--- a/Tests/Utils/testFmmAlgorithmPeriodic.cpp
+++ b/Tests/Utils/testFmmAlgorithmPeriodic.cpp
@@ -15,21 +15,21 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
 
-#include "../Src/Core/FFmmAlgorithmPeriodic.hpp"
+#include "../../Src/Core/FFmmAlgorithmPeriodic.hpp"
 
 /** This program show an example of use of
   * the fmm basic algo
diff --git a/Tests/Utils/testFmmAlgorithmProc.cpp b/Tests/Utils/testFmmAlgorithmProc.cpp
index 21218e063a10e286a9c87ccff6bb3226dca6bdce..2ad18cb82dd7e58eb1c2f53616e4c939159b28f3 100644
--- a/Tests/Utils/testFmmAlgorithmProc.cpp
+++ b/Tests/Utils/testFmmAlgorithmProc.cpp
@@ -13,34 +13,34 @@
 // @FUSE_MPI
 // ================
 
-#include "../Src/Utils/FMpi.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FMpi.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FGlobal.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
-#include "../Src/Utils/FAbstractSendable.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FAbstractSendable.hpp"
 
-#include "../Src/Components/FFmaParticle.hpp"
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
-#include "../Src/Extensions/FExtendPhysicalValue.hpp"
+#include "../../Src/Components/FFmaParticle.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
+#include "../../Src/Extensions/FExtendPhysicalValue.hpp"
 
 
-#include "../Src/Core/FFmmAlgorithmThreadProc.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
 
-#include "../Src/Files/FFmaBinLoader.hpp"
-#include "../Src/Files/FMpiFmaLoader.hpp"
-#include "../Src/Files/FMpiTreeBuilder.hpp"
+#include "../../Src/Files/FFmaBinLoader.hpp"
+#include "../../Src/Files/FMpiFmaLoader.hpp"
+#include "../../Src/Files/FMpiTreeBuilder.hpp"
 
-#include "../Src/Components/FBasicKernels.hpp"
+#include "../../Src/Components/FBasicKernels.hpp"
 
 #include <iostream>
 #include <cstdio>
diff --git a/Tests/Utils/testFmmAlgorithmProcPeriodic.cpp b/Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
index 0a9c05aed55e87cd89a1ed0ae87ca462540d5829..72350a86d1b44ffd74fd7d89c8ab9adffc8ab3e9 100644
--- a/Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
+++ b/Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
@@ -18,25 +18,25 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
 
-#include "../Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp"
+#include "../../Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp"
 
-#include "../Src/Files/FMpiTreeBuilder.hpp"
+#include "../../Src/Files/FMpiTreeBuilder.hpp"
 
-#include "../Src/Utils/FAbstractSendable.hpp"
+#include "../../Src/Utils/FAbstractSendable.hpp"
 
 
 /** This program show an example of use of
diff --git a/Tests/Utils/testFmmAlgorithmTsm.cpp b/Tests/Utils/testFmmAlgorithmTsm.cpp
index 294e8021e08ed992b4957200aae588e9e77c40f0..ea5593693ea2111a6b209bdc5631d1c6c3650a92 100644
--- a/Tests/Utils/testFmmAlgorithmTsm.cpp
+++ b/Tests/Utils/testFmmAlgorithmTsm.cpp
@@ -14,29 +14,29 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Components/FTypedLeaf.hpp"
+#include "../../Src/Components/FTypedLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
 
-#include "../Src/Extensions/FExtendParticleType.hpp"
-#include "../Src/Extensions/FExtendCellType.hpp"
+#include "../../Src/Extensions/FExtendParticleType.hpp"
+#include "../../Src/Extensions/FExtendCellType.hpp"
 
-#include "../Src/Core/FFmmAlgorithmTsm.hpp"
-#include "../Src/Core/FFmmAlgorithmThreadTsm.hpp"
+#include "../../Src/Core/FFmmAlgorithmTsm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThreadTsm.hpp"
 
-#include "../Src/Components/FBasicKernels.hpp"
+#include "../../Src/Components/FBasicKernels.hpp"
 
-#include "../Src/Files/FRandomLoader.hpp"
+#include "../../Src/Files/FRandomLoader.hpp"
 
 /** This program show an example of use of
   * the fmm basic algo
diff --git a/Tests/Utils/testFmmDemonstration.cpp b/Tests/Utils/testFmmDemonstration.cpp
index 3e6b8fd228988f7845cfd02d5f399a9c8740a3c5..d5f0bae9be212601bef260715b988d552d8901b9 100644
--- a/Tests/Utils/testFmmDemonstration.cpp
+++ b/Tests/Utils/testFmmDemonstration.cpp
@@ -14,28 +14,28 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
 
 
-#include "../Src/Components/FBasicKernels.hpp"
+#include "../../Src/Components/FBasicKernels.hpp"
 
-#include "../Src/Files/FRandomLoader.hpp"
+#include "../../Src/Files/FRandomLoader.hpp"
 
 // My cell is actually a basic cell => minimum of data
 class MyCell : public FBasicCell {
diff --git a/Tests/Utils/testLoader.cpp b/Tests/Utils/testLoader.cpp
index 2d8160d90605ea96ce59f1c8af501a6feccb666e..42b6c11b55ca9d1d726a6f01239f0c742440de13 100644
--- a/Tests/Utils/testLoader.cpp
+++ b/Tests/Utils/testLoader.cpp
@@ -15,21 +15,21 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Utils/FAssertable.hpp"
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FAssertable.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FBasicParticle.hpp"
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FBasicParticle.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Files/FBasicLoader.hpp"
+#include "../../Src/Files/FBasicLoader.hpp"
 
 /**
   * In this file we show an example of FBasicLoader use
diff --git a/Tests/Utils/testLoaderCreate.cpp b/Tests/Utils/testLoaderCreate.cpp
index 168c1f2d6a8e026de3b5293acfed5396c5f72a1b..27b9dd792eae68e8e0b30f337abf821bda25e35c 100644
--- a/Tests/Utils/testLoaderCreate.cpp
+++ b/Tests/Utils/testLoaderCreate.cpp
@@ -16,8 +16,8 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 // This file can generate basic particles files to load with basic loader
 // g++ testLoaderCreate.cpp -o testLoaderCreate.exe
diff --git a/Tests/Utils/testLoaderFMA.cpp b/Tests/Utils/testLoaderFMA.cpp
index a86da4cf486edc825494364f3f82041012718472..7ac474b33e2e6a48c61471791ed0fffc7ba57f51 100644
--- a/Tests/Utils/testLoaderFMA.cpp
+++ b/Tests/Utils/testLoaderFMA.cpp
@@ -15,23 +15,23 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Utils/FAssertable.hpp"
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FAssertable.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FFmaParticle.hpp"
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FFmaParticle.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Files/FFmaLoader.hpp"
+#include "../../Src/Files/FFmaLoader.hpp"
 
-// Compile by : g++ testLoaderFMA.cpp ../Src/Utils/FDebug.cpp ../Src/Utils/FTrace.cpp -O2 -o testLoaderFMA.exe
+// Compile by : g++ testLoaderFMA.cpp ../../Src/Utils/FDebug.cpp ../../Src/Utils/FTrace.cpp -O2 -o testLoaderFMA.exe
 
 
 /**
diff --git a/Tests/Utils/testLoaderFMABinCreate.cpp b/Tests/Utils/testLoaderFMABinCreate.cpp
index c2ee52357e3329f480b84e20edd640316c51d931..0ba8f97b3da921f6e86073c2bf817e9629683af0 100644
--- a/Tests/Utils/testLoaderFMABinCreate.cpp
+++ b/Tests/Utils/testLoaderFMABinCreate.cpp
@@ -16,8 +16,8 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 // This file can generate basic particles files in the FMA format
 
diff --git a/Tests/Utils/testLoaderFMABinCreateSphere.cpp b/Tests/Utils/testLoaderFMABinCreateSphere.cpp
index 1b10e0eb216eb957c1a0b79d55a54e30817588c9..df8ce7c572b0cf6a8364ae1ce1a46e58efe4bbed 100644
--- a/Tests/Utils/testLoaderFMABinCreateSphere.cpp
+++ b/Tests/Utils/testLoaderFMABinCreateSphere.cpp
@@ -17,9 +17,9 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FMath.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FMath.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 // This file can generate basic particles files in the FMA format
 
diff --git a/Tests/Utils/testLoaderFMACreate.cpp b/Tests/Utils/testLoaderFMACreate.cpp
index 1ab415377c18b1a58c9811eddd4ad348965f9ab5..24778b67ff6f344bbeb868604fea64de7b2975c2 100644
--- a/Tests/Utils/testLoaderFMACreate.cpp
+++ b/Tests/Utils/testLoaderFMACreate.cpp
@@ -16,8 +16,8 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 // This file can generate basic particles files in the FMA format
 
diff --git a/Tests/Utils/testLoaderFMACreateSphere.cpp b/Tests/Utils/testLoaderFMACreateSphere.cpp
index 27f77fe2833397133856736f0ca254ebc29218e2..6990811c84b3241aaaa005e1f0cff85e96cbbf9e 100644
--- a/Tests/Utils/testLoaderFMACreateSphere.cpp
+++ b/Tests/Utils/testLoaderFMACreateSphere.cpp
@@ -18,10 +18,10 @@
 
 #include <cmath>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FMath.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FMath.hpp"
 
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 // This file can generate basic particles files to load with basic loader
 
diff --git a/Tests/Utils/testLoaderFMATsm.cpp b/Tests/Utils/testLoaderFMATsm.cpp
index 8178e74bb480f857d267e77ba0fb37290235e9c0..0e54c7c1606d9d9067f111f172f57357847c1bd6 100644
--- a/Tests/Utils/testLoaderFMATsm.cpp
+++ b/Tests/Utils/testLoaderFMATsm.cpp
@@ -15,25 +15,25 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Utils/FAssertable.hpp"
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FAssertable.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FFmaParticle.hpp"
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FFmaParticle.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Extensions/FExtendParticleType.hpp"
+#include "../../Src/Extensions/FExtendParticleType.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Files/FFmaTsmLoader.hpp"
+#include "../../Src/Files/FFmaTsmLoader.hpp"
 
 
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 /**
   * In this file we show an example of FFmaLoader use
diff --git a/Tests/Utils/testLoaderFMATsmCreate.cpp b/Tests/Utils/testLoaderFMATsmCreate.cpp
index 5e51c92927a437e3e1ecddabcf46c1d77f140aa4..ab092e2157271d9744045d8c5de3fe19249dfad7 100644
--- a/Tests/Utils/testLoaderFMATsmCreate.cpp
+++ b/Tests/Utils/testLoaderFMATsmCreate.cpp
@@ -16,8 +16,8 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
 // This file can generate basic particles files in the FMA format
 
diff --git a/Tests/Utils/testMemStats.cpp b/Tests/Utils/testMemStats.cpp
index 66f1dbc7ebde01c52e98574dc2b060e7145e1785..20d367abc66af19f06c8db87d146fe36647bf716 100644
--- a/Tests/Utils/testMemStats.cpp
+++ b/Tests/Utils/testMemStats.cpp
@@ -14,26 +14,26 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
-#include "../Src/Components/FTestKernels.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestKernels.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalKernel.hpp"
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalKernel.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
 
 /** This program show an example of use of
   * the fmm basic algo
diff --git a/Tests/Utils/testMortonIndex.cpp b/Tests/Utils/testMortonIndex.cpp
index f7a758452cf467822067bd1a8965c90d7d9e31b0..fd3d803aa741597ec15b55afe95dfce02931752c 100644
--- a/Tests/Utils/testMortonIndex.cpp
+++ b/Tests/Utils/testMortonIndex.cpp
@@ -19,24 +19,24 @@
 #include <vector>
 #include <algorithm>
 
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FBasicParticle.hpp"
+#include "../../Src/Components/FBasicParticle.hpp"
 
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Files/FHLoader.hpp"
+#include "../../Src/Files/FHLoader.hpp"
 
 static const int PrintPrecision = 6;
 
diff --git a/Tests/Utils/testMpiCsvSaver.cpp b/Tests/Utils/testMpiCsvSaver.cpp
index ed0e1620c29781283ae47be123efb98ed2193d4f..c8656f1b8dcd33b71df4c98bc519bc2c420482ca 100644
--- a/Tests/Utils/testMpiCsvSaver.cpp
+++ b/Tests/Utils/testMpiCsvSaver.cpp
@@ -19,23 +19,23 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FMpi.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FMpi.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Extensions/FExtendVelocity.hpp"
+#include "../../Src/Extensions/FExtendVelocity.hpp"
 
-#include "../Src/Files/FTreeMpiCsvSaver.hpp"
-#include "../Src/Files/FFmaLoader.hpp"
-#include "../Src/Arranger/FOctreeArranger.hpp"
+#include "../../Src/Files/FTreeMpiCsvSaver.hpp"
+#include "../../Src/Files/FFmaLoader.hpp"
+#include "../../Src/Arranger/FOctreeArranger.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
 
 class FmmVeloParticle : public FSphericalParticle, public FExtendVelocity {
 };
diff --git a/Tests/Utils/testOctree.cpp b/Tests/Utils/testOctree.cpp
index 42f41eb99d977dfb1bd8a73159b3509f52bd97f7..fa7a92e78a1ab1181bf5ee0c4b1574dbcf7f49de 100644
--- a/Tests/Utils/testOctree.cpp
+++ b/Tests/Utils/testOctree.cpp
@@ -15,20 +15,20 @@
 #include <cstdlib>
 #include <time.h>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Utils/FAssertable.hpp"
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FAssertable.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FBasicParticle.hpp"
-#include "../Src/Components/FBasicCell.hpp"
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FBasicParticle.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Files/FRandomLoader.hpp"
+#include "../../Src/Files/FRandomLoader.hpp"
 
 /**
 * In this file we show how to use octree
diff --git a/Tests/Utils/testOctreeIter.cpp b/Tests/Utils/testOctreeIter.cpp
index b38261f7671f253af224342ca00d1539dacf1864..53c0786688a524b8469cb87a845cf0f570638528 100644
--- a/Tests/Utils/testOctreeIter.cpp
+++ b/Tests/Utils/testOctreeIter.cpp
@@ -16,19 +16,19 @@
 #include <time.h>
 
 
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/FAssertable.hpp"
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FAssertable.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FBasicParticle.hpp"
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FBasicParticle.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
 /**
 * In this file we show how to use octree with iteration
diff --git a/Tests/Utils/testOctreePrintMorton.cpp b/Tests/Utils/testOctreePrintMorton.cpp
index 5858d0e00373ddfd8c3867470e3c42249d9d92f0..d130de461cfdcf47dbbec15c354fdcbc0e11ae6c 100644
--- a/Tests/Utils/testOctreePrintMorton.cpp
+++ b/Tests/Utils/testOctreePrintMorton.cpp
@@ -16,10 +16,10 @@
 #include <time.h>
 #include <string>
 
-#include "../Src/Utils/FGlobal.hpp"
-#include "../Src/Containers/FTreeCoordinate.hpp"
-#include "../Src/Utils/F3DPosition.hpp"
-#include "../Src/Utils/FMath.hpp"
+#include "../../Src/Utils/FGlobal.hpp"
+#include "../../Src/Containers/FTreeCoordinate.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/FMath.hpp"
 
 /**
 * In this file we show the morton indexed for each boxes
diff --git a/Tests/Utils/testOctreeRearrange.cpp b/Tests/Utils/testOctreeRearrange.cpp
index 0591b9d2618d2736d6eb3e91ef48866340c567b7..88a21fe33499d7190769bd3b840998c230e60e3e 100644
--- a/Tests/Utils/testOctreeRearrange.cpp
+++ b/Tests/Utils/testOctreeRearrange.cpp
@@ -14,20 +14,20 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
 
-#include "../Src/Arranger/FOctreeArranger.hpp"
+#include "../../Src/Arranger/FOctreeArranger.hpp"
 
 
 // Simply create particles and try the kernels
diff --git a/Tests/Utils/testOctreeRearrangeProc.cpp b/Tests/Utils/testOctreeRearrangeProc.cpp
index 924c209b63aa7173040fe0e5ed8b39de437e3348..09f1b916c920920ad82b2d49e24e3e61d7a247fa 100644
--- a/Tests/Utils/testOctreeRearrangeProc.cpp
+++ b/Tests/Utils/testOctreeRearrangeProc.cpp
@@ -18,21 +18,21 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FParameters.hpp"
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
-#include "../Src/Utils/F3DPosition.hpp"
+#include "../../Src/Utils/F3DPosition.hpp"
 
-#include "../Src/Components/FTestParticle.hpp"
-#include "../Src/Components/FTestCell.hpp"
+#include "../../Src/Components/FTestParticle.hpp"
+#include "../../Src/Components/FTestCell.hpp"
 
-#include "../Src/Arranger/FOctreeArrangerProc.hpp"
-#include "../Src/Files/FMpiTreeBuilder.hpp"
+#include "../../Src/Arranger/FOctreeArrangerProc.hpp"
+#include "../../Src/Files/FMpiTreeBuilder.hpp"
 
 
 // Simply create particles and try the kernels
diff --git a/Tests/Utils/testStatsTree.cpp b/Tests/Utils/testStatsTree.cpp
index 8bd9cf36dd7e805b2778dd7a6278ef5bbb38f004..e95a1e98620bf14b3dd218db7c5b7dcbc13de209 100644
--- a/Tests/Utils/testStatsTree.cpp
+++ b/Tests/Utils/testStatsTree.cpp
@@ -14,27 +14,27 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
-#include "../Src/Components/FFmaParticle.hpp"
-#include "../Src/Extensions/FExtendForces.hpp"
-#include "../Src/Extensions/FExtendPotential.hpp"
+#include "../../Src/Components/FFmaParticle.hpp"
+#include "../../Src/Extensions/FExtendForces.hpp"
+#include "../../Src/Extensions/FExtendPotential.hpp"
 
-#include "../Src/Components/FBasicCell.hpp"
+#include "../../Src/Components/FBasicCell.hpp"
 
-#include "../Src/Core/FFmmAlgorithm.hpp"
-#include "../Src/Core/FFmmAlgorithmThread.hpp"
+#include "../../Src/Core/FFmmAlgorithm.hpp"
+#include "../../Src/Core/FFmmAlgorithmThread.hpp"
 
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"
 
 
-#include "../Src/Utils/FMath.hpp"
+#include "../../Src/Utils/FMath.hpp"
 
-#include "../Src/Files/FFmaLoader.hpp"
+#include "../../Src/Files/FFmaLoader.hpp"
 
 
 /** This program show an example of use of
diff --git a/Tests/Utils/testTic.cpp b/Tests/Utils/testTic.cpp
index 525892311c5302058a9a7f03323078abf6fe9704..a5ac94a4fe6f00a2a8f28fc497cb3318daf7b851 100644
--- a/Tests/Utils/testTic.cpp
+++ b/Tests/Utils/testTic.cpp
@@ -9,7 +9,7 @@
 // Copyright © 2011-2012, spread under the terms and conditions of a proprietary license.
 // ===================================================================================
 #include <iostream>
-#include "../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FTic.hpp"
 
 #include <cstdlib>
 #include <unistd.h>
diff --git a/Tests/Utils/testTreeIO.cpp b/Tests/Utils/testTreeIO.cpp
index 46b71e20f092991161e5f6dfe39ae2a8892be5da..6e518b116a5148dc14b2d52e94840dfe64e2b7dd 100644
--- a/Tests/Utils/testTreeIO.cpp
+++ b/Tests/Utils/testTreeIO.cpp
@@ -14,19 +14,19 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "../Src/Utils/FTic.hpp"
-#include "../Src/Utils/FParameters.hpp"
+#include "../../Src/Utils/FTic.hpp"
+#include "../../Src/Utils/FParameters.hpp"
 
-#include "../Src/Containers/FOctree.hpp"
-#include "../Src/Containers/FVector.hpp"
+#include "../../Src/Containers/FOctree.hpp"
+#include "../../Src/Containers/FVector.hpp"
 
 
-#include "../Src/Files/FFmaLoader.hpp"
-#include "../Src/Files/FTreeIO.hpp"
+#include "../../Src/Files/FFmaLoader.hpp"
+#include "../../Src/Files/FTreeIO.hpp"
 
-#include "../Src/Kernels/Spherical/FSphericalCell.hpp"
-#include "../Src/Kernels/Spherical/FSphericalParticle.hpp"
-#include "../Src/Components/FSimpleLeaf.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalCell.hpp"
+#include "../../Src/Kernels/Spherical/FSphericalParticle.hpp"
+#include "../../Src/Components/FSimpleLeaf.hpp"