diff --git a/mo/src/eval/moDoubleIncrEvaluation.h b/mo/src/eval/moDoubleIncrEvaluation.h
index c7027e2b8..cf6ec57be 100644
--- a/mo/src/eval/moDoubleIncrEvaluation.h
+++ b/mo/src/eval/moDoubleIncrEvaluation.h
@@ -35,8 +35,8 @@
 #ifndef moDoubleIncrEvaluation_H
 #define moDoubleIncrEvaluation_H
 
-#include <eval/moNeighborhoodEvaluation.h>
-#include <continuator/moUpdater.h>
+#include "moNeighborhoodEvaluation.h"
+#include "../continuator/moUpdater.h"
 
 /**
  * Base class for the double incremental evaluation of the neighborhood
diff --git a/mo/src/eval/moDoubleIncrNeighborhoodEval.h b/mo/src/eval/moDoubleIncrNeighborhoodEval.h
index 61ef09176..3cb11c684 100644
--- a/mo/src/eval/moDoubleIncrNeighborhoodEval.h
+++ b/mo/src/eval/moDoubleIncrNeighborhoodEval.h
@@ -35,8 +35,8 @@
 #ifndef moDoubleIncrNeighborhoodEval_H
 #define moDoubleIncrNeighborhoodEval_H
 
-#include <eval/moEval.h>
-#include <eval/moDoubleIncrEvaluation.h>
+#include "moEval.h"
+#include "moDoubleIncrEvaluation.h"
 
 /**
  * Evaluation of a neighbor from the full evaluation f the neighborhood
diff --git a/mo/src/eval/moDummyEval.h b/mo/src/eval/moDummyEval.h
index 2809f12a3..424407046 100644
--- a/mo/src/eval/moDummyEval.h
+++ b/mo/src/eval/moDummyEval.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDummyEval_h
 #define _moDummyEval_h
 
-#include <eval/moEval.h>
+#include "moEval.h"
 
 /**
  * Dummy Evaluation function
diff --git a/mo/src/eval/moEval.h b/mo/src/eval/moEval.h
index 835a8ae8e..e153be971 100644
--- a/mo/src/eval/moEval.h
+++ b/mo/src/eval/moEval.h
@@ -35,7 +35,7 @@
 #ifndef moEval_H
 #define moEval_H
 
-#include <eoFunctor.h>
+#include <paradiseo/eo/eoFunctor.h>
 
 /**
  * Abstract class for the evaluation
diff --git a/mo/src/eval/moEvalCounter.h b/mo/src/eval/moEvalCounter.h
index e12949b1f..e47520dd1 100644
--- a/mo/src/eval/moEvalCounter.h
+++ b/mo/src/eval/moEvalCounter.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moEvalCounter_h
 #define _moEvalCounter_h
 
-#include <eval/moEval.h>
-#include <utils/eoParam.h>
+#include "moEval.h"
+#include <paradiseo/eo/utils/eoParam.h>
 
 /**
     Counts the number of neighbor evaluations actually performed, 
diff --git a/mo/src/eval/moFullEvalByCopy.h b/mo/src/eval/moFullEvalByCopy.h
index 701a7b951..501f9449b 100644
--- a/mo/src/eval/moFullEvalByCopy.h
+++ b/mo/src/eval/moFullEvalByCopy.h
@@ -35,8 +35,8 @@
 #ifndef moFullEvalByCopy_H
 #define moFullEvalByCopy_H
 
-#include <eoEvalFunc.h>
-#include <eval/moEval.h>
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "moEval.h"
 
 /**
  * Evaluation by copy
diff --git a/mo/src/eval/moFullEvalByModif.h b/mo/src/eval/moFullEvalByModif.h
index 80ee94d1c..b7efa3cea 100644
--- a/mo/src/eval/moFullEvalByModif.h
+++ b/mo/src/eval/moFullEvalByModif.h
@@ -35,8 +35,8 @@
 #ifndef moFullEvalByModif_H
 #define moFullEvalByModif_H
 
-#include <eoEvalFunc.h>
-#include <eval/moEval.h>
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "moEval.h"
 
 /**
  * Full evaluation to use with a moBackableNeighbor
diff --git a/mo/src/eval/moNeighborhoodEvaluation.h b/mo/src/eval/moNeighborhoodEvaluation.h
index 92274c133..01cc67c76 100644
--- a/mo/src/eval/moNeighborhoodEvaluation.h
+++ b/mo/src/eval/moNeighborhoodEvaluation.h
@@ -35,7 +35,7 @@
 #ifndef moNeighborhoodEvaluation_H
 #define moNeighborhoodEvaluation_H
 
-#include <eoFunctor.h>
+#include <paradiseo/eo/eoFunctor.h>
 
 /**
  * Abstract class for the evaluation 
diff --git a/mo/src/explorer/moDummyExplorer.h b/mo/src/explorer/moDummyExplorer.h
index 3d58dbb08..62c94fd09 100644
--- a/mo/src/explorer/moDummyExplorer.h
+++ b/mo/src/explorer/moDummyExplorer.h
@@ -35,7 +35,7 @@
 #ifndef _moDummyExplorer_h
 #define _moDummyExplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
+#include "moNeighborhoodExplorer.h"
 
 /**
  * Dummy Explorer the neighborhood: nothing is explored
diff --git a/mo/src/explorer/moFirstImprHCexplorer.h b/mo/src/explorer/moFirstImprHCexplorer.h
index e341908d3..37eaa5ce5 100644
--- a/mo/src/explorer/moFirstImprHCexplorer.h
+++ b/mo/src/explorer/moFirstImprHCexplorer.h
@@ -35,10 +35,10 @@
 #ifndef _moFirstImprHCexplorer_h
 #define _moFirstImprHCexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../neighborhood/moNeighborhood.h"
 
 /**
  * Explorer for a first improvement heuristic
diff --git a/mo/src/explorer/moILSexplorer.h b/mo/src/explorer/moILSexplorer.h
index 761009005..34b406968 100644
--- a/mo/src/explorer/moILSexplorer.h
+++ b/mo/src/explorer/moILSexplorer.h
@@ -35,12 +35,12 @@
 #ifndef _moILSexplorer_h
 #define _moILSexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <algo/moLocalSearch.h>
-#include <perturb/moPerturbation.h>
-#include <acceptCrit/moAcceptanceCriterion.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../algo/moLocalSearch.h"
+#include "../perturb/moPerturbation.h"
+#include "../acceptCrit/moAcceptanceCriterion.h"
 //#include <neighborhood/moDummyNeighborhood.h>
 //#include <neighborhood/moDummyNeighbor.h>
 
diff --git a/mo/src/explorer/moMetropolisHastingExplorer.h b/mo/src/explorer/moMetropolisHastingExplorer.h
index 1989ff1c3..9d3804312 100644
--- a/mo/src/explorer/moMetropolisHastingExplorer.h
+++ b/mo/src/explorer/moMetropolisHastingExplorer.h
@@ -37,12 +37,12 @@
 
 #include <cstdlib>
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "comparator/moNeighborComparator.h"
+#include "comparator/moSolNeighborComparator.h"
+#include "neighborhood/moNeighborhood.h"
 
-#include <utils/eoRNG.h>
+#include <paradiseo/eo/utils/eoRNG.h>
 
 /**
  * Explorer for the Metropolis-Hasting Sampling.
diff --git a/mo/src/explorer/moNeighborhoodExplorer.h b/mo/src/explorer/moNeighborhoodExplorer.h
index 8b4113b7a..94f464a56 100644
--- a/mo/src/explorer/moNeighborhoodExplorer.h
+++ b/mo/src/explorer/moNeighborhoodExplorer.h
@@ -36,12 +36,12 @@
 #define _neighborhoodExplorer_h
 
 //EO inclusion
-#include <eoFunctor.h>
+#include <paradiseo/eo/eoFunctor.h>
 
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <neighborhood/moDummyNeighborhood.h>
-#include <eval/moDummyEval.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include "../neighborhood/moDummyNeighborhood.h"
+#include "../eval/moDummyEval.h"
 
 /**
  * Explore the neighborhood according to the local search algorithm 
diff --git a/mo/src/explorer/moNeutralHCexplorer.h b/mo/src/explorer/moNeutralHCexplorer.h
index 40443de40..00cc88cdc 100644
--- a/mo/src/explorer/moNeutralHCexplorer.h
+++ b/mo/src/explorer/moNeutralHCexplorer.h
@@ -35,10 +35,10 @@
 #ifndef _moNeutralHCexplorer_h
 #define _moNeutralHCexplorer_h
 
-#include <explorer/moRandomBestHCexplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moRandomBestHCexplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../neighborhood/moNeighborhood.h"
 
 /**
  * Explorer for a neutral Hill-climbing
diff --git a/mo/src/explorer/moRandomBestHCexplorer.h b/mo/src/explorer/moRandomBestHCexplorer.h
index e96f6673b..5e591e0f6 100644
--- a/mo/src/explorer/moRandomBestHCexplorer.h
+++ b/mo/src/explorer/moRandomBestHCexplorer.h
@@ -35,12 +35,12 @@
 #ifndef _moRandomBestHCexplorer_h
 #define _moRandomBestHCexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../neighborhood/moNeighborhood.h"
 #include <vector>
-#include <utils/eoRNG.h>
+#include <paradiseo/eo/utils/eoRNG.h>
 
 /**
  * Explorer for Hill-Climbing
diff --git a/mo/src/explorer/moRandomNeutralWalkExplorer.h b/mo/src/explorer/moRandomNeutralWalkExplorer.h
index 95995c753..460c9e156 100644
--- a/mo/src/explorer/moRandomNeutralWalkExplorer.h
+++ b/mo/src/explorer/moRandomNeutralWalkExplorer.h
@@ -35,9 +35,9 @@
 #ifndef _moRandomNeutralWalkexplorer_h
 #define _moRandomNeutralWalkexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../neighborhood/moNeighborhood.h"
 
 /**
  * Explorer for a random neutral walk
diff --git a/mo/src/explorer/moRandomSearchExplorer.h b/mo/src/explorer/moRandomSearchExplorer.h
index 0b09da1d9..efee48b48 100644
--- a/mo/src/explorer/moRandomSearchExplorer.h
+++ b/mo/src/explorer/moRandomSearchExplorer.h
@@ -35,10 +35,10 @@
 #ifndef _moRandomSearchexplorer_h
 #define _moRandomSearchexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eoEvalFunc.h>
-#include <eoInit.h>
+#include "moNeighborhoodExplorer.h"
+#include "../neighborhood/moNeighborhood.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include <paradiseo/eo/eoInit.h>
 
 /**
  * Explorer for a pure random search:
diff --git a/mo/src/explorer/moRandomWalkExplorer.h b/mo/src/explorer/moRandomWalkExplorer.h
index 78f1be303..8bd78ac1d 100644
--- a/mo/src/explorer/moRandomWalkExplorer.h
+++ b/mo/src/explorer/moRandomWalkExplorer.h
@@ -35,10 +35,10 @@
 #ifndef _moRandomWalkexplorer_h
 #define _moRandomWalkexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../neighborhood/moNeighborhood.h"
 
 /**
  * Explorer for a random walk
diff --git a/mo/src/explorer/moSAexplorer.h b/mo/src/explorer/moSAexplorer.h
index 08d859035..cc0877381 100644
--- a/mo/src/explorer/moSAexplorer.h
+++ b/mo/src/explorer/moSAexplorer.h
@@ -37,12 +37,12 @@
 
 #include <cstdlib>
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <coolingSchedule/moCoolingSchedule.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../coolingSchedule/moCoolingSchedule.h"
+#include "../neighborhood/moNeighborhood.h"
 
-#include <utils/eoRNG.h>
+#include <paradiseo/eo/utils/eoRNG.h>
 
 /**
  * Explorer for the Simulated Annealing
diff --git a/mo/src/explorer/moSimpleHCexplorer.h b/mo/src/explorer/moSimpleHCexplorer.h
index b4f235ae8..a53ae5f8d 100644
--- a/mo/src/explorer/moSimpleHCexplorer.h
+++ b/mo/src/explorer/moSimpleHCexplorer.h
@@ -35,10 +35,10 @@
 #ifndef _moSimpleHCexplorer_h
 #define _moSimpleHCexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../neighborhood/moNeighborhood.h"
 
 /**
  * Explorer for a simple Hill-climbing
diff --git a/mo/src/explorer/moTSexplorer.h b/mo/src/explorer/moTSexplorer.h
index 062af93cc..06c84c368 100644
--- a/mo/src/explorer/moTSexplorer.h
+++ b/mo/src/explorer/moTSexplorer.h
@@ -34,14 +34,14 @@
 #ifndef _moTSexplorer_h
 #define _moTSexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moSolNeighborComparator.h>
-#include <memory/moAspiration.h>
-#include <memory/moTabuList.h>
-#include <memory/moIntensification.h>
-#include <memory/moDiversification.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhoodExplorer.h"
+#include "../comparator/moNeighborComparator.h"
+#include "../comparator/moSolNeighborComparator.h"
+#include "../memory/moAspiration.h"
+#include "../memory/moTabuList.h"
+#include "../memory/moIntensification.h"
+#include "../memory/moDiversification.h"
+#include "../neighborhood/moNeighborhood.h"
 
 /**
  * Explorer for a Tabu Search
diff --git a/mo/src/explorer/moVNSexplorer.h b/mo/src/explorer/moVNSexplorer.h
index 3c9c2ef27..a79d4d5a0 100644
--- a/mo/src/explorer/moVNSexplorer.h
+++ b/mo/src/explorer/moVNSexplorer.h
@@ -30,10 +30,10 @@
 #ifndef _moVNSexplorer_h
 #define _moVNSexplorer_h
 
-#include <explorer/moNeighborhoodExplorer.h>
-#include <neighborhood/moVariableNeighborhoodSelection.h>
-#include <eoOp.h>
-#include <acceptCrit/moAcceptanceCriterion.h>
+#include "moNeighborhoodExplorer.h"
+#include "../neighborhood/moVariableNeighborhoodSelection.h"
+#include <paradiseo/eo/eoOp.h>
+#include "../acceptCrit/moAcceptanceCriterion.h"
 
 /**
  * Explorer for the "Variable Neighborhood Search" metaheuristic
diff --git a/mo/src/memory/moAspiration.h b/mo/src/memory/moAspiration.h
index 7a9e338e0..36abe9fa8 100644
--- a/mo/src/memory/moAspiration.h
+++ b/mo/src/memory/moAspiration.h
@@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moAspiration_h
 #define _moAspiration_h
 
-#include <eoFunctor.h>
+#include <paradiseo/eo/eoFunctor.h>
 
 /**
  * Abstract class for Aspiration Criteria
diff --git a/mo/src/memory/moBestImprAspiration.h b/mo/src/memory/moBestImprAspiration.h
index 7187ef666..6ef24441d 100644
--- a/mo/src/memory/moBestImprAspiration.h
+++ b/mo/src/memory/moBestImprAspiration.h
@@ -31,7 +31,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moBestImprAspiration_h
 #define _moBestImprAspiration_h
 
-#include <memory/moAspiration.h>
+#include "moAspiration.h"
 
 /**
  * Aspiration criteria accepts a solution better than the best so far
diff --git a/mo/src/memory/moCountMoveMemory.h b/mo/src/memory/moCountMoveMemory.h
index 22cbba5fd..d9a1d330a 100644
--- a/mo/src/memory/moCountMoveMemory.h
+++ b/mo/src/memory/moCountMoveMemory.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moCountMoveMemory_h
 #define _moCountMoveMemory_h
 
-#include <memory/moMemory.h>
+#include "moMemory.h"
 
 /**
  * Count the number of move, no move and  the successive stagnation since the last Move
diff --git a/mo/src/memory/moDiversification.h b/mo/src/memory/moDiversification.h
index 5df67a3fe..15444c506 100644
--- a/mo/src/memory/moDiversification.h
+++ b/mo/src/memory/moDiversification.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDiversification_h
 #define _moDiversification_h
 
-#include <memory/moMemory.h>
-#include <eoFunctor.h>
+#include "moMemory.h"
+#include <paradiseo/eo/eoFunctor.h>
 
 /**
  * Abstract class for diversification strategy
diff --git a/mo/src/memory/moDummyDiversification.h b/mo/src/memory/moDummyDiversification.h
index 72cd1f686..c48a15a14 100644
--- a/mo/src/memory/moDummyDiversification.h
+++ b/mo/src/memory/moDummyDiversification.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDummyDiversification_h
 #define _moDummyDiversification_h
 
-#include <memory/moDiversification.h>
-#include <memory/moDummyMemory.h>
+#include "moDiversification.h"
+#include "moDummyMemory.h"
 
 /**
  * Dummy diversification strategy
diff --git a/mo/src/memory/moDummyIntensification.h b/mo/src/memory/moDummyIntensification.h
index d6fd9ef3d..7ad695f98 100644
--- a/mo/src/memory/moDummyIntensification.h
+++ b/mo/src/memory/moDummyIntensification.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDummyIntensification_h
 #define _moDummyIntensification_h
 
-#include <memory/moIntensification.h>
-#include <memory/moDummyMemory.h>
+#include "moIntensification.h"
+#include "moDummyMemory.h"
 
 /**
  * Dummy intensification strategy
diff --git a/mo/src/memory/moDummyMemory.h b/mo/src/memory/moDummyMemory.h
index c927a30f0..f9866f93d 100644
--- a/mo/src/memory/moDummyMemory.h
+++ b/mo/src/memory/moDummyMemory.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDummyMemory_h
 #define _moDummyMemory_h
 
-#include <memory/moMemory.h>
+#include "moMemory.h"
 
 /**
  * Dummy memory to make an empty memory
diff --git a/mo/src/memory/moIndexedVectorTabuList.h b/mo/src/memory/moIndexedVectorTabuList.h
index e1ea94492..d6c76877d 100644
--- a/mo/src/memory/moIndexedVectorTabuList.h
+++ b/mo/src/memory/moIndexedVectorTabuList.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moIndexedVectorTabuList_h
 #define _moIndexedVectorTabuList_h
 
-#include <utils/eoRndGenerators.h>
-#include <memory/moTabuList.h>
+#include <paradiseo/eo/utils/eoRndGenerators.h>
+#include "moTabuList.h"
 #include <vector>
 #include <iostream>
 
diff --git a/mo/src/memory/moIntensification.h b/mo/src/memory/moIntensification.h
index 44d6c1bc3..8cee94616 100644
--- a/mo/src/memory/moIntensification.h
+++ b/mo/src/memory/moIntensification.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moIntensification_h
 #define _moIntensification_h
 
-#include <memory/moMemory.h>
-#include <eoFunctor.h>
+#include "moMemory.h"
+#include <paradiseo/eo/eoFunctor.h>
 
 /**
  * Abstract class for intensification strategy
diff --git a/mo/src/memory/moMonOpDiversification.h b/mo/src/memory/moMonOpDiversification.h
index 46fa8547b..d9b5f8fd7 100644
--- a/mo/src/memory/moMonOpDiversification.h
+++ b/mo/src/memory/moMonOpDiversification.h
@@ -31,10 +31,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #define _moMonOpDiversification_h
 
 
-#include <eoEvalFunc.h>
-#include <eoOp.h>
-#include <memory/moDiversification.h>
-#include <memory/moDummyMemory.h>
+#include <paradiseo/eo/eoEvalFunc.h>
+#include <paradiseo/eo/eoOp.h>
+#include "moDiversification.h"
+#include "moDummyMemory.h"
 
 /**
  * Diversification strategy applies a "monOp" operator
diff --git a/mo/src/memory/moNeighborVectorTabuList.h b/mo/src/memory/moNeighborVectorTabuList.h
index dbf8edb0f..9a6d0c7de 100644
--- a/mo/src/memory/moNeighborVectorTabuList.h
+++ b/mo/src/memory/moNeighborVectorTabuList.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moNeighborVectorTabuList_h
 #define _moNeighborVectorTabuList_h
 
-#include <memory/moTabuList.h>
+#include "moTabuList.h"
 #include <vector>
 #include <iostream>
 
diff --git a/mo/src/memory/moRndIndexedVectorTabuList.h b/mo/src/memory/moRndIndexedVectorTabuList.h
index 82ffc0e04..4e9deacea 100644
--- a/mo/src/memory/moRndIndexedVectorTabuList.h
+++ b/mo/src/memory/moRndIndexedVectorTabuList.h
@@ -30,8 +30,8 @@
 #ifndef _moRndIndexedVectorTabuList_h
 #define _moRndIndexedVectorTabuList_h
 
-#include <memory/moIndexedVectorTabuList.h>
-#include <utils/eoRndGenerators.h>
+#include "moIndexedVectorTabuList.h"
+#include <paradiseo/eo/utils/eoRndGenerators.h>
 
 
 /**
diff --git a/mo/src/memory/moSolVectorTabuList.h b/mo/src/memory/moSolVectorTabuList.h
index ba72ccc43..1e6a0694d 100644
--- a/mo/src/memory/moSolVectorTabuList.h
+++ b/mo/src/memory/moSolVectorTabuList.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moSolVectorTabuList_h
 #define _moSolVectorTabuList_h
 
-#include <memory/moTabuList.h>
+#include "moTabuList.h"
 #include <vector>
 #include <iostream>
 
diff --git a/mo/src/memory/moTabuList.h b/mo/src/memory/moTabuList.h
index 018996e8a..a7b36a972 100644
--- a/mo/src/memory/moTabuList.h
+++ b/mo/src/memory/moTabuList.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moTabuList_h
 #define _moTabuList_h
 
-#include <memory/moMemory.h>
+#include "moMemory.h"
 
 /**
  * Abstract class for the Tabu List
diff --git a/mo/src/mo.h b/mo/src/mo.h
index 8a6343aeb..a781b6b9c 100755
--- a/mo/src/mo.h
+++ b/mo/src/mo.h
@@ -35,162 +35,162 @@
 #ifndef _newmo_h
 #define _newmo_h
 
-#include <acceptCrit/moAcceptanceCriterion.h>
-#include <acceptCrit/moAlwaysAcceptCrit.h>
-#include <acceptCrit/moBetterAcceptCrit.h>
+#include "acceptCrit/moAcceptanceCriterion.h"
+#include "acceptCrit/moAlwaysAcceptCrit.h"
+#include "acceptCrit/moBetterAcceptCrit.h"
 
-#include <algo/moDummyLS.h>
-#include <algo/moFirstImprHC.h>
-#include <algo/moILS.h>
-#include <algo/moLocalSearch.h>
-#include <algo/moMetropolisHasting.h>
-#include <algo/moNeutralHC.h>
-#include <algo/moRandomBestHC.h>
-#include <algo/moRandomNeutralWalk.h>
-#include <algo/moRandomSearch.h>
-#include <algo/moRandomWalk.h>
-#include <algo/moSA.h>
-#include <algo/moSimpleHC.h>
-#include <algo/moTS.h>
-#include <algo/moVNS.h>
-#include <algo/eoDummyMonOp.h>
+#include "algo/moDummyLS.h"
+#include "algo/moFirstImprHC.h"
+#include "algo/moILS.h"
+#include "algo/moLocalSearch.h"
+#include "algo/moMetropolisHasting.h"
+#include "algo/moNeutralHC.h"
+#include "algo/moRandomBestHC.h"
+#include "algo/moRandomNeutralWalk.h"
+#include "algo/moRandomSearch.h"
+#include "algo/moRandomWalk.h"
+#include "algo/moSA.h"
+#include "algo/moSimpleHC.h"
+#include "algo/moTS.h"
+#include "algo/moVNS.h"
+#include "algo/eoDummyMonOp.h"
 
-#include <comparator/moComparator.h>
-#include <comparator/moNeighborComparator.h>
-#include <comparator/moEqualNeighborComparator.h>
-#include <comparator/moEqualSolNeighborComparator.h>
-#include <comparator/moSolComparator.h>
-#include <comparator/moEqualSolComparator.h>
-#include <comparator/moSolNeighborComparator.h>
+#include "comparator/moComparator.h"
+#include "comparator/moNeighborComparator.h"
+#include "comparator/moEqualNeighborComparator.h"
+#include "comparator/moEqualSolNeighborComparator.h"
+#include "comparator/moSolComparator.h"
+#include "comparator/moEqualSolComparator.h"
+#include "comparator/moSolNeighborComparator.h"
 
-#include <continuator/moAverageFitnessNeighborStat.h>
-#include <continuator/moBestSoFarStat.h>
-#include <continuator/moBestFitnessStat.h>
-#include <continuator/moUnsignedStat.h>
-#include <continuator/moValueStat.h>
-#include <continuator/moBooleanStat.h>
-#include <continuator/moCheckpoint.h>
-#include <continuator/moCombinedContinuator.h>
-#include <continuator/moContinuator.h>
-#include <continuator/moCounterMonitorSaver.h>
-#include <continuator/moCounterStat.h>
-#include <continuator/moDistanceStat.h>
-#include <continuator/moFitContinuator.h>
-#include <continuator/moFitnessStat.h>
-#include <continuator/moFullEvalContinuator.h>
-#include <continuator/moEvalsContinuator.h>
-#include <continuator/moIterContinuator.h>
-#include <continuator/moMaxNeighborStat.h>
-#include <continuator/moMinNeighborStat.h>
-#include <continuator/moMinusOneCounterStat.h>
-#include <continuator/moNbInfNeighborStat.h>
-#include <continuator/moNbSupNeighborStat.h>
-#include <continuator/moNeighborBestStat.h>
-#include <continuator/moNeighborEvalContinuator.h>
-#include <continuator/moNeighborFitnessStat.h>
-#include <continuator/moNeighborhoodStat.h>
-#include <continuator/moNeutralDegreeNeighborStat.h>
-#include <continuator/moSecondMomentNeighborStat.h>
-#include <continuator/moSizeNeighborStat.h>
-#include <continuator/moSolutionStat.h>
-#include <continuator/moStat.h>
-#include <continuator/moStatBase.h>
-#include <continuator/moStatFromStat.h>
-#include <continuator/moStdFitnessNeighborStat.h>
-#include <continuator/moTimeContinuator.h>
-#include <continuator/moTrueContinuator.h>
-#include <continuator/moVectorMonitor.h>
+#include "continuator/moAverageFitnessNeighborStat.h"
+#include "continuator/moBestSoFarStat.h"
+#include "continuator/moBestFitnessStat.h"
+#include "continuator/moUnsignedStat.h"
+#include "continuator/moValueStat.h"
+#include "continuator/moBooleanStat.h"
+#include "continuator/moCheckpoint.h"
+#include "continuator/moCombinedContinuator.h"
+#include "continuator/moContinuator.h"
+#include "continuator/moCounterMonitorSaver.h"
+#include "continuator/moCounterStat.h"
+#include "continuator/moDistanceStat.h"
+#include "continuator/moFitContinuator.h"
+#include "continuator/moFitnessStat.h"
+#include "continuator/moFullEvalContinuator.h"
+#include "continuator/moEvalsContinuator.h"
+#include "continuator/moIterContinuator.h"
+#include "continuator/moMaxNeighborStat.h"
+#include "continuator/moMinNeighborStat.h"
+#include "continuator/moMinusOneCounterStat.h"
+#include "continuator/moNbInfNeighborStat.h"
+#include "continuator/moNbSupNeighborStat.h"
+#include "continuator/moNeighborBestStat.h"
+#include "continuator/moNeighborEvalContinuator.h"
+#include "continuator/moNeighborFitnessStat.h"
+#include "continuator/moNeighborhoodStat.h"
+#include "continuator/moNeutralDegreeNeighborStat.h"
+#include "continuator/moSecondMomentNeighborStat.h"
+#include "continuator/moSizeNeighborStat.h"
+#include "continuator/moSolutionStat.h"
+#include "continuator/moStat.h"
+#include "continuator/moStatBase.h"
+#include "continuator/moStatFromStat.h"
+#include "continuator/moStdFitnessNeighborStat.h"
+#include "continuator/moTimeContinuator.h"
+#include "continuator/moTrueContinuator.h"
+#include "continuator/moVectorMonitor.h"
 
-#include <coolingSchedule/moCoolingSchedule.h>
-#include <coolingSchedule/moDynSpanCoolingSchedule.h>
-#include <coolingSchedule/moSimpleCoolingSchedule.h>
-#include <coolingSchedule/moDynSpanCoolingSchedule.h>
+#include "coolingSchedule/moCoolingSchedule.h"
+#include "coolingSchedule/moDynSpanCoolingSchedule.h"
+#include "coolingSchedule/moSimpleCoolingSchedule.h"
+#include "coolingSchedule/moDynSpanCoolingSchedule.h"
 
-#include <eval/moDummyEval.h>
-#include <eval/moEval.h>
-#include <eval/moEvalCounter.h>
-#include <eval/moFullEvalByCopy.h>
-#include <eval/moFullEvalByModif.h>
-#include <eval/moDoubleIncrNeighborhoodEval.h>
+#include "eval/moDummyEval.h"
+#include "eval/moEval.h"
+#include "eval/moEvalCounter.h"
+#include "eval/moFullEvalByCopy.h"
+#include "eval/moFullEvalByModif.h"
+#include "eval/moDoubleIncrNeighborhoodEval.h"
 
-#include <explorer/moDummyExplorer.h>
-#include <explorer/moFirstImprHCexplorer.h>
-#include <explorer/moILSexplorer.h>
-#include <explorer/moMetropolisHastingExplorer.h>
-#include <explorer/moNeighborhoodExplorer.h>
-#include <explorer/moNeutralHCexplorer.h>
-#include <explorer/moRandomBestHCexplorer.h>
-#include <explorer/moRandomNeutralWalkExplorer.h>
-#include <explorer/moRandomSearchExplorer.h>
-#include <explorer/moRandomWalkExplorer.h>
-#include <explorer/moSAexplorer.h>
-#include <explorer/moSimpleHCexplorer.h>
-#include <explorer/moTSexplorer.h>
-#include <explorer/moVNSexplorer.h>
+#include "explorer/moDummyExplorer.h"
+#include "explorer/moFirstImprHCexplorer.h"
+#include "explorer/moILSexplorer.h"
+#include "explorer/moMetropolisHastingExplorer.h"
+#include "explorer/moNeighborhoodExplorer.h"
+#include "explorer/moNeutralHCexplorer.h"
+#include "explorer/moRandomBestHCexplorer.h"
+#include "explorer/moRandomNeutralWalkExplorer.h"
+#include "explorer/moRandomSearchExplorer.h"
+#include "explorer/moRandomWalkExplorer.h"
+#include "explorer/moSAexplorer.h"
+#include "explorer/moSimpleHCexplorer.h"
+#include "explorer/moTSexplorer.h"
+#include "explorer/moVNSexplorer.h"
 
-#include <memory/moAspiration.h>
-#include <memory/moBestImprAspiration.h>
-#include <memory/moCountMoveMemory.h>
-#include <memory/moDiversification.h>
-#include <memory/moDummyDiversification.h>
-#include <memory/moDummyIntensification.h>
-#include <memory/moDummyMemory.h>
-#include <memory/moIndexedVectorTabuList.h>
-#include <memory/moIntensification.h>
-#include <memory/moMemory.h>
-#include <memory/moMonOpDiversification.h>
-#include <memory/moNeighborVectorTabuList.h>
-#include <memory/moRndIndexedVectorTabuList.h>
-#include <memory/moSolVectorTabuList.h>
-#include <memory/moRndIndexedVectorTabuList.h>
-#include <memory/moTabuList.h>
+#include "memory/moAspiration.h"
+#include "memory/moBestImprAspiration.h"
+#include "memory/moCountMoveMemory.h"
+#include "memory/moDiversification.h"
+#include "memory/moDummyDiversification.h"
+#include "memory/moDummyIntensification.h"
+#include "memory/moDummyMemory.h"
+#include "memory/moIndexedVectorTabuList.h"
+#include "memory/moIntensification.h"
+#include "memory/moMemory.h"
+#include "memory/moMonOpDiversification.h"
+#include "memory/moNeighborVectorTabuList.h"
+#include "memory/moRndIndexedVectorTabuList.h"
+#include "memory/moSolVectorTabuList.h"
+#include "memory/moRndIndexedVectorTabuList.h"
+#include "memory/moTabuList.h"
 
-#include <neighborhood/moBackableNeighbor.h>
-#include <neighborhood/moBackwardVectorVNSelection.h>
-#include <neighborhood/moDummyNeighbor.h>
-#include <neighborhood/moDummyNeighborhood.h>
-#include <neighborhood/moForwardVectorVNSelection.h>
-#include <neighborhood/moIndexNeighbor.h>
-#include <neighborhood/moIndexNeighborhood.h>
-#include <neighborhood/moNeighbor.h>
-#include <neighborhood/moNeighborhood.h>
-#include <neighborhood/moOrderNeighborhood.h>
-#include <neighborhood/moRndNeighborhood.h>
-#include <neighborhood/moRndVectorVNSelection.h>
-#include <neighborhood/moRndWithoutReplNeighborhood.h>
-#include <neighborhood/moRndWithReplNeighborhood.h>
-#include <neighborhood/moVariableNeighborhoodSelection.h>
-#include <neighborhood/moVectorVNSelection.h>
-#include <neighborhood/moEvaluatedNeighborhood.h>
+#include "neighborhood/moBackableNeighbor.h"
+#include "neighborhood/moBackwardVectorVNSelection.h"
+#include "neighborhood/moDummyNeighbor.h"
+#include "neighborhood/moDummyNeighborhood.h"
+#include "neighborhood/moForwardVectorVNSelection.h"
+#include "neighborhood/moIndexNeighbor.h"
+#include "neighborhood/moIndexNeighborhood.h"
+#include "neighborhood/moNeighbor.h"
+#include "neighborhood/moNeighborhood.h"
+#include "neighborhood/moOrderNeighborhood.h"
+#include "neighborhood/moRndNeighborhood.h"
+#include "neighborhood/moRndVectorVNSelection.h"
+#include "neighborhood/moRndWithoutReplNeighborhood.h"
+#include "neighborhood/moRndWithReplNeighborhood.h"
+#include "neighborhood/moVariableNeighborhoodSelection.h"
+#include "neighborhood/moVectorVNSelection.h"
+#include "neighborhood/moEvaluatedNeighborhood.h"
 
-#include <perturb/moLocalSearchInit.h>
-#include <perturb/moMonOpPerturb.h>
-#include <perturb/moNeighborhoodPerturb.h>
-#include <perturb/moPerturbation.h>
-#include <perturb/moRestartPerturb.h>
-#include <perturb/moSolInit.h>
+#include "perturb/moLocalSearchInit.h"
+#include "perturb/moMonOpPerturb.h"
+#include "perturb/moNeighborhoodPerturb.h"
+#include "perturb/moPerturbation.h"
+#include "perturb/moRestartPerturb.h"
+#include "perturb/moSolInit.h"
 
-#include <problems/bitString/moBitNeighbor.h>
-#include <problems/bitString/moBitsNeighbor.h>
-#include <problems/bitString/moBitsNeighborhood.h>
-#include <problems/bitString/moBitsWithoutReplNeighborhood.h>
-#include <problems/bitString/moBitsWithReplNeighborhood.h>
+#include "problems/bitString/moBitNeighbor.h"
+#include "problems/bitString/moBitsNeighbor.h"
+#include "problems/bitString/moBitsNeighborhood.h"
+#include "problems/bitString/moBitsWithoutReplNeighborhood.h"
+#include "problems/bitString/moBitsWithReplNeighborhood.h"
 
-#include <problems/permutation/moIndexedSwapNeighbor.h>
-#include <problems/permutation/moShiftNeighbor.h>
-#include <problems/permutation/moSwapNeighbor.h>
-#include <problems/permutation/moSwapNeighborhood.h>
-#include <problems/permutation/moTwoOptExNeighbor.h>
-#include <problems/permutation/moTwoOptExNeighborhood.h>
+#include "problems/permutation/moIndexedSwapNeighbor.h"
+#include "problems/permutation/moShiftNeighbor.h"
+#include "problems/permutation/moSwapNeighbor.h"
+#include "problems/permutation/moSwapNeighborhood.h"
+#include "problems/permutation/moTwoOptExNeighbor.h"
+#include "problems/permutation/moTwoOptExNeighborhood.h"
 
-//#include <problems/eval/moMaxSATincrEval.h>
-//#include <problems/eval/moOneMaxIncrEval.h>
-//#include <problems/eval/moQAPIncrEval.h>
-//#include <problems/eval/moRoyalRoadIncrEval.h>
-//#include <problems/eval/moUBQPSimpleIncrEval.h>
-//#include <problems/eval/moUBQPdoubleIncrEvaluation.h>
-//#include <problems/eval/moUBQPBitsIncrEval.h>
-//#include <problems/eval/moNKlandscapesIncrEval.h>
+//#include "problems/eval/moMaxSATincrEval.h"
+//#include "problems/eval/moOneMaxIncrEval.h"
+//#include "problems/eval/moQAPIncrEval.h"
+//#include "problems/eval/moRoyalRoadIncrEval.h"
+//#include "problems/eval/moUBQPSimpleIncrEval.h"
+//#include "problems/eval/moUBQPdoubleIncrEvaluation.h"
+//#include "problems/eval/moUBQPBitsIncrEval.h"
+//#include "problems/eval/moNKlandscapesIncrEval.h"
 
 
 #include <sampling/moAdaptiveWalkSampling.h>
diff --git a/mo/src/perturb/moLocalSearchInit.h b/mo/src/perturb/moLocalSearchInit.h
index e8f977111..3cae04544 100644
--- a/mo/src/perturb/moLocalSearchInit.h
+++ b/mo/src/perturb/moLocalSearchInit.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moLocalSearchInit_h
 #define _moLocalSearchInit_h
 
-#include "../../eo/eoInit.h"
+#include <paradiseo/eo/eoInit.h>
 #include "../algo/moLocalSearch.h"
 
 /**
diff --git a/mo/src/problems/bitString/moBitFlipNeighborhood.h b/mo/src/problems/bitString/moBitFlipNeighborhood.h
index dbbe05c26..67931fbb9 100644
--- a/mo/src/problems/bitString/moBitFlipNeighborhood.h
+++ b/mo/src/problems/bitString/moBitFlipNeighborhood.h
@@ -35,8 +35,8 @@
 #ifndef _moBitFlipNeighborhood_h
 #define _moBitFlipNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
-#include <utils/eoRNG.h>
+#include "../../neighborhood/moNeighborhood.h"
+#include <paradiseo/eo/utils/eoRNG.h>
 #include <vector>
 
 /**
diff --git a/mo/src/problems/bitString/moBitNeighbor.h b/mo/src/problems/bitString/moBitNeighbor.h
index 28cda0093..78f0d281e 100644
--- a/mo/src/problems/bitString/moBitNeighbor.h
+++ b/mo/src/problems/bitString/moBitNeighbor.h
@@ -35,9 +35,9 @@
 #ifndef _bitNeighbor_h
 #define _bitNeighbor_h
 
-#include <ga/eoBit.h>
-#include <neighborhood/moBackableNeighbor.h>
-#include <neighborhood/moIndexNeighbor.h>
+#include <paradiseo/eo/ga/eoBit.h>
+#include "../../neighborhood/moBackableNeighbor.h>
+#include "../../neighborhood/moIndexNeighbor.h>
 
 /**
  * Neighbor related to a vector of Bit
diff --git a/mo/src/problems/bitString/moBitsNeighbor.h b/mo/src/problems/bitString/moBitsNeighbor.h
index e0f1363f1..e9930e082 100644
--- a/mo/src/problems/bitString/moBitsNeighbor.h
+++ b/mo/src/problems/bitString/moBitsNeighbor.h
@@ -35,7 +35,7 @@
 #ifndef _moBitsNeighbor_h
 #define _moBitsNeighbor_h
 
-#include <neighborhood/moNeighbor.h>
+#include "../../neighborhood/moNeighbor.h"
 #include <vector>
 
 /**
diff --git a/mo/src/problems/bitString/moBitsNeighborhood.h b/mo/src/problems/bitString/moBitsNeighborhood.h
index 2d4557f2f..824b7f83a 100644
--- a/mo/src/problems/bitString/moBitsNeighborhood.h
+++ b/mo/src/problems/bitString/moBitsNeighborhood.h
@@ -35,8 +35,8 @@
 #ifndef _moBitsNeighborhood_h
 #define _moBitsNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
-#include <utils/eoRNG.h>
+#include "../../neighborhood/moNeighborhood.h"
+#include <paradiseo/eo/utils/eoRNG.h>
 #include <vector>
 
 /**
diff --git a/mo/src/problems/bitString/moBitsWithReplNeighborhood.h b/mo/src/problems/bitString/moBitsWithReplNeighborhood.h
index 8c833f1a2..b7e4dceb1 100644
--- a/mo/src/problems/bitString/moBitsWithReplNeighborhood.h
+++ b/mo/src/problems/bitString/moBitsWithReplNeighborhood.h
@@ -35,9 +35,9 @@
 #ifndef _moBitsWithReplNeighborhood_h
 #define _moBitsWithReplNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
-#include <problems/bitString/moBitsNeighborhood.h>
-#include <utils/eoRNG.h>
+#include "../../neighborhood/moNeighborhood.h"
+#include "moBitsNeighborhood.h"
+#include <paradiseo/eo/utils/eoRNG.h>
 #include <vector>
 
 /**
diff --git a/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h b/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h
index 4584a791a..96785996d 100644
--- a/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h
+++ b/mo/src/problems/bitString/moBitsWithoutReplNeighborhood.h
@@ -35,9 +35,9 @@
 #ifndef _moBitsWithoutReplNeighborhood_h
 #define _moBitsWithoutReplNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
-#include <problems/bitString/moBitsNeighborhood.h>
-#include <utils/eoRNG.h>
+#include "../../neighborhood/moNeighborhood.h"
+#include "moBitsNeighborhood.h"
+#include <paradiseo/eo/utils/eoRNG.h>
 #include <vector>
 
 /**
diff --git a/mo/src/problems/eval/moMaxSATincrEval.h b/mo/src/problems/eval/moMaxSATincrEval.h
index 69dfbdb2e..27bc07528 100644
--- a/mo/src/problems/eval/moMaxSATincrEval.h
+++ b/mo/src/problems/eval/moMaxSATincrEval.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moMaxSATincrEval_h
 #define _moMaxSATincrEval_h
 
-#include <eval/moEval.h>
-#include <eval/maxSATeval.h>
+#include "../../eval/moEval.h"
+#include "../../../problems/eval/maxSATeval.h"
 
 /**
  * Incremental evaluation Function for the max SAT problem
diff --git a/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h b/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h
index c9a0ff0f3..5a319538e 100644
--- a/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h
+++ b/mo/src/problems/eval/moNKlandscapesBitsIncrEval.h
@@ -30,8 +30,8 @@
 #ifndef _moNKlandscapesBitsIncrEval_H
 #define _moNKlandscapesBitsIncrEval_H
 
-#include <eval/moEval.h>
-#include <eval/nkLandscapesEval.h>
+#include "../../eval/moEval.h"
+#include "../../../problems/eval/nkLandscapesEval.h"
 #include <vector>
 
 /**
diff --git a/mo/src/problems/eval/moNKlandscapesIncrEval.h b/mo/src/problems/eval/moNKlandscapesIncrEval.h
index 6635c0de0..8eef015cd 100644
--- a/mo/src/problems/eval/moNKlandscapesIncrEval.h
+++ b/mo/src/problems/eval/moNKlandscapesIncrEval.h
@@ -30,8 +30,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moNKlandscapesIncrEval_H
 #define _moNKlandscapesIncrEval_H
 
-#include <eval/moEval.h>
-#include <eval/nkLandscapesEval.h>
+#include "../../eval/moEval.h"
+#include "../../../problems/eval/nkLandscapesEval.h"
+
 #include <vector>
 
 /**
diff --git a/mo/src/problems/eval/moOneMaxBitsIncrEval.h b/mo/src/problems/eval/moOneMaxBitsIncrEval.h
index 5758d3c29..2f235709d 100644
--- a/mo/src/problems/eval/moOneMaxBitsIncrEval.h
+++ b/mo/src/problems/eval/moOneMaxBitsIncrEval.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moOneMaxBitsIncrEval_H
 #define _moOneMaxBitsIncrEval_H
 
-#include <eval/moEval.h>
+#include "../../eval/moEval.h"
 
 /**
  * Incremental evaluation Function for the OneMax problem
diff --git a/mo/src/problems/eval/moOneMaxIncrEval.h b/mo/src/problems/eval/moOneMaxIncrEval.h
index c97b096e2..f42b0b6ab 100644
--- a/mo/src/problems/eval/moOneMaxIncrEval.h
+++ b/mo/src/problems/eval/moOneMaxIncrEval.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moOneMaxIncrEval_H
 #define _moOneMaxIncrEval_H
 
-#include <eval/moEval.h>
+#include "../../eval/moEval.h"
 
 /**
  * Incremental evaluation Function for the OneMax problem
diff --git a/mo/src/problems/eval/moQAPIncrEval.h b/mo/src/problems/eval/moQAPIncrEval.h
index 16494e4b0..9a169aa6f 100644
--- a/mo/src/problems/eval/moQAPIncrEval.h
+++ b/mo/src/problems/eval/moQAPIncrEval.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moQAPIncrEval_H
 #define _moQAPIncrEval_H
 
-#include <eval/moEval.h>
-#include <eval/qapEval.h>
+#include "../../eval/moEval.h"
+#include "../../../problems/eval/qapEval.h"
 
 /**
  * Incremental evaluation Function for the QAP problem
diff --git a/mo/src/problems/eval/moRoyalRoadIncrEval.h b/mo/src/problems/eval/moRoyalRoadIncrEval.h
index 3296ab25f..2763e00c1 100644
--- a/mo/src/problems/eval/moRoyalRoadIncrEval.h
+++ b/mo/src/problems/eval/moRoyalRoadIncrEval.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moRoyalRoadIncrEval_H
 #define _moRoyalRoadIncrEval_H
 
-#include <eval/moEval.h>
-#include <eval/royalRoadEval.h>
+#include "../../eval/moEval.h"
+#include "../../../problems/eval/royalRoadEval.h"
 
 /**
  * Incremental evaluation Function for the Royal Road problem
diff --git a/mo/src/problems/eval/moUBQPBitsIncrEval.h b/mo/src/problems/eval/moUBQPBitsIncrEval.h
index d6a55c3d7..00d2c1043 100644
--- a/mo/src/problems/eval/moUBQPBitsIncrEval.h
+++ b/mo/src/problems/eval/moUBQPBitsIncrEval.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moUBQPBitsIncrEval_H
 #define _moUBQPBitsIncrEval_H
 
-#include <eval/moEval.h>
-#include <eval/ubqpEval.h>
+#include "../../eval/moEval.h"
+#include "../../../problems/eval/ubqpEval.h"
 
 /**
  * Incremental evaluation Function for the UBQPSimple problem
diff --git a/mo/src/problems/eval/moUBQPSimpleIncrEval.h b/mo/src/problems/eval/moUBQPSimpleIncrEval.h
index 78e6be0f5..caf908d9f 100644
--- a/mo/src/problems/eval/moUBQPSimpleIncrEval.h
+++ b/mo/src/problems/eval/moUBQPSimpleIncrEval.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moUBQPSimpleIncrEval_H
 #define _moUBQPSimpleIncrEval_H
 
-#include <eval/moEval.h>
-#include <eval/ubqpEval.h>
+#include "../eval/moEval.h"
+#include "../../../problems/eval/ubqpEval.h"
 
 /**
  * Incremental evaluation Function for the UBQPSimple problem
diff --git a/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h b/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h
index d9d149a83..71fd71ff4 100644
--- a/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h
+++ b/mo/src/problems/eval/moUBQPdoubleIncrEvaluation.h
@@ -35,9 +35,9 @@
 #ifndef moUBQPdoubleIncrEvaluation_H
 #define moUBQPdoubleIncrEvaluation_H
 
-#include <eval/moDoubleIncrEvaluation.h>
-#include <explorer/moNeighborhoodExplorer.h>
-#include <eval/moEval.h>
+#include "../../eval/moDoubleIncrEvaluation.h"
+#include "../../explorer/moNeighborhoodExplorer.h"
+#include "../../eval/moEval.h"
 
 /**
  * The neighborhood evaluation for the UBQP
diff --git a/mo/src/problems/permutation/moIndexedSwapNeighbor.h b/mo/src/problems/permutation/moIndexedSwapNeighbor.h
index 4706305f6..825a9d794 100644
--- a/mo/src/problems/permutation/moIndexedSwapNeighbor.h
+++ b/mo/src/problems/permutation/moIndexedSwapNeighbor.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moIndexedSwapNeighbor_h
 #define _moIndexedSwapNeighbor_h
 
-#include <neighborhood/moBackableNeighbor.h>
-#include <neighborhood/moIndexNeighbor.h>
+#include "../../neighborhood/moBackableNeighbor.h"
+#include "../../neighborhood/moIndexNeighbor.h"
 
 /**
  * Indexed Swap Neighbor: the position of the swap are computed according to the index
diff --git a/mo/src/problems/permutation/moShiftNeighbor.h b/mo/src/problems/permutation/moShiftNeighbor.h
index 13eba1849..de59170ee 100644
--- a/mo/src/problems/permutation/moShiftNeighbor.h
+++ b/mo/src/problems/permutation/moShiftNeighbor.h
@@ -30,8 +30,8 @@
 #ifndef _moShiftNeighbor_h
 #define _moShiftNeighbor_h
 
-#include <neighborhood/moBackableNeighbor.h>
-#include <neighborhood/moIndexNeighbor.h>
+#include "../neighborhood/moBackableNeighbor.h"
+#include "../neighborhood/moIndexNeighbor.h"
 
 /**
  * Indexed Shift Neighbor
diff --git a/mo/src/problems/permutation/moSwapNeighbor.h b/mo/src/problems/permutation/moSwapNeighbor.h
index 55dfcbe8d..09f1218cd 100644
--- a/mo/src/problems/permutation/moSwapNeighbor.h
+++ b/mo/src/problems/permutation/moSwapNeighbor.h
@@ -30,7 +30,7 @@
 #ifndef _moSwapNeighbor_h
 #define _moSwapNeighbor_h
 
-#include <neighborhood/moBackableNeighbor.h>
+#include "../neighborhood/moBackableNeighbor.h"
 
 /**
  * Swap Neighbor
diff --git a/mo/src/problems/permutation/moSwapNeighborhood.h b/mo/src/problems/permutation/moSwapNeighborhood.h
index 8354337e6..e62ec8687 100644
--- a/mo/src/problems/permutation/moSwapNeighborhood.h
+++ b/mo/src/problems/permutation/moSwapNeighborhood.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moSwapNeighborhood_h
 #define _moSwapNeighborhood_h
 
-#include <problems/permutation/moSwapNeighbor.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moSwapNeighbor.h"
+#include "../../neighborhood/moNeighborhood.h"
 
 /**
  * Swap Neighborhood
diff --git a/mo/src/problems/permutation/moTwoOptExNeighbor.h b/mo/src/problems/permutation/moTwoOptExNeighbor.h
index ae82fd45d..64560f66d 100755
--- a/mo/src/problems/permutation/moTwoOptExNeighbor.h
+++ b/mo/src/problems/permutation/moTwoOptExNeighbor.h
@@ -30,7 +30,7 @@
 #ifndef _moTwoOptExNeighbor_h
 #define _moTwoOptExNeighbor_h
 
-#include <neighborhood/moBackableNeighbor.h>
+#include "../../neighborhood/moBackableNeighbor.h"
 
 /**
  * Two-opt exchange neighbor
diff --git a/mo/src/problems/permutation/moTwoOptExNeighborhood.h b/mo/src/problems/permutation/moTwoOptExNeighborhood.h
index 9723946bb..2b9ea43dd 100755
--- a/mo/src/problems/permutation/moTwoOptExNeighborhood.h
+++ b/mo/src/problems/permutation/moTwoOptExNeighborhood.h
@@ -30,10 +30,9 @@
 #ifndef _moTwoOptExNeighborhood_h
 #define _moTwoOptExNeighborhood_h
 
-#include <problems/permutation/moTwoOptExNeighbor.h>
-#include <neighborhood/moNeighborhood.h>
-
-#include <neighborhood/moIndexNeighborhood.h>
+#include "moTwoOptExNeighbor.h"
+#include "../../neighborhood/moNeighborhood.h"
+#include "../../neighborhood/moIndexNeighborhood.h"
 
 /**
  * Two-opt exchange neighborhood
diff --git a/mo/src/sampling/moAdaptiveWalkSampling.h b/mo/src/sampling/moAdaptiveWalkSampling.h
index 04dafe876..1da48ad14 100644
--- a/mo/src/sampling/moAdaptiveWalkSampling.h
+++ b/mo/src/sampling/moAdaptiveWalkSampling.h
@@ -35,20 +35,20 @@
 #ifndef moAdaptiveWalkSampling_h
 #define moAdaptiveWalkSampling_h
 
-#include <eoInit.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <continuator/moCheckpoint.h>
-#include <perturb/moLocalSearchInit.h>
-#include <algo/moRandomSearch.h>
-#include <algo/moFirstImprHC.h>
-#include <continuator/moSolutionStat.h>
-#include <continuator/moMinusOneCounterStat.h>
-#include <continuator/moStatFromStat.h>
-#include <sampling/moSampling.h>
-#include <eval/moEvalCounter.h>
-#include <eoEvalFuncCounter.h>
-#include <continuator/moValueStat.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../continuator/moCheckpoint.h"
+#include "../perturb/moLocalSearchInit.h"
+#include "../algo/moRandomSearch.h"
+#include "../algo/moFirstImprHC.h"
+#include "../continuator/moSolutionStat.h"
+#include "../continuator/moMinusOneCounterStat.h"
+#include "../continuator/moStatFromStat.h"
+#include "moSampling.h"
+#include "../eval/moEvalCounter.h"
+#include <paradiseo/eo/eoEvalFuncCounter.h>
+#include "../continuator/moValueStat.h"
 
 /**
  * To compute the length and final solution of an adaptive walk:
diff --git a/mo/src/sampling/moAutocorrelationSampling.h b/mo/src/sampling/moAutocorrelationSampling.h
index 3dbeaf954..0bf332b55 100644
--- a/mo/src/sampling/moAutocorrelationSampling.h
+++ b/mo/src/sampling/moAutocorrelationSampling.h
@@ -35,12 +35,12 @@
 #ifndef moAutocorrelationSampling_h
 #define moAutocorrelationSampling_h
 
-#include <eoInit.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomWalk.h>
-#include <continuator/moFitnessStat.h>
-#include <sampling/moSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moRandomWalk.h"
+#include "../continuator/moFitnessStat.h"
+#include "moSampling.h"
 
 /**
  * To compute the autocorrelation function:
diff --git a/mo/src/sampling/moDensityOfStatesSampling.h b/mo/src/sampling/moDensityOfStatesSampling.h
index 571f546de..e48ef0708 100644
--- a/mo/src/sampling/moDensityOfStatesSampling.h
+++ b/mo/src/sampling/moDensityOfStatesSampling.h
@@ -35,11 +35,11 @@
 #ifndef moDensityOfStatesSampling_h
 #define moDensityOfStatesSampling_h
 
-#include <eoInit.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomSearch.h>
-#include <continuator/moFitnessStat.h>
-#include <sampling/moSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moRandomSearch.h"
+#include "../continuator/moFitnessStat.h"
+#include "moSampling.h"
 
 /**
  * To compute the density of states:
diff --git a/mo/src/sampling/moFDCsampling.h b/mo/src/sampling/moFDCsampling.h
index f3ed422c1..bdde164cf 100644
--- a/mo/src/sampling/moFDCsampling.h
+++ b/mo/src/sampling/moFDCsampling.h
@@ -35,14 +35,14 @@
 #ifndef moFDCsampling_h
 #define moFDCsampling_h
 
-#include <eoInit.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomSearch.h>
-#include <continuator/moFitnessStat.h>
-#include <utils/eoDistance.h>
-#include <continuator/moDistanceStat.h>
-#include <sampling/moSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moRandomSearch.h"
+#include "../continuator/moFitnessStat.h"
+#include <paradiseo/eo/utils/eoDistance.h>
+#include "../continuator/moDistanceStat.h"
+#include "moSampling.h"
 
 /**
  * To compute the fitness distance correlation:
diff --git a/mo/src/sampling/moFitnessCloudSampling.h b/mo/src/sampling/moFitnessCloudSampling.h
index 15817555a..771724684 100644
--- a/mo/src/sampling/moFitnessCloudSampling.h
+++ b/mo/src/sampling/moFitnessCloudSampling.h
@@ -35,14 +35,14 @@
 #ifndef moFitnessCloudSampling_h
 #define moFitnessCloudSampling_h
 
-#include <eoInit.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moDummyLS.h>
-#include <continuator/moFitnessStat.h>
-#include <continuator/moNeighborFitnessStat.h>
-#include <sampling/moSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moDummyLS.h"
+#include "../continuator/moFitnessStat.h"
+#include "../continuator/moNeighborFitnessStat.h"
+#include "moSampling.h"
 
 /**
  * To compute an estimation of the fitness cloud,
diff --git a/mo/src/sampling/moHillClimberSampling.h b/mo/src/sampling/moHillClimberSampling.h
index d6bc45a28..e52f79ff1 100644
--- a/mo/src/sampling/moHillClimberSampling.h
+++ b/mo/src/sampling/moHillClimberSampling.h
@@ -35,17 +35,17 @@
 #ifndef moHillClimberSampling_h
 #define moHillClimberSampling_h
 
-#include <eoInit.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <continuator/moCheckpoint.h>
-#include <perturb/moLocalSearchInit.h>
-#include <algo/moRandomSearch.h>
-#include <algo/moSimpleHC.h>
-#include <continuator/moSolutionStat.h>
-#include <continuator/moMinusOneCounterStat.h>
-#include <continuator/moStatFromStat.h>
-#include <sampling/moSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../continuator/moCheckpoint.h"
+#include "../perturb/moLocalSearchInit.h"
+#include "../algo/moRandomSearch.h"
+#include "../algo/moSimpleHC.h"
+#include "../continuator/moSolutionStat.h"
+#include "../continuator/moMinusOneCounterStat.h"
+#include "../continuator/moStatFromStat.h"
+#include "moSampling.h"
 
 /**
  * To compute the length and final solution of an adaptive walk:
diff --git a/mo/src/sampling/moMHBestFitnessCloudSampling.h b/mo/src/sampling/moMHBestFitnessCloudSampling.h
index ebba8a3b9..d8d607c1f 100644
--- a/mo/src/sampling/moMHBestFitnessCloudSampling.h
+++ b/mo/src/sampling/moMHBestFitnessCloudSampling.h
@@ -35,13 +35,13 @@
 #ifndef moMHBestFitnessCloudSampling_h
 #define moMHBestFitnessCloudSampling_h
 
-#include <eoInit.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moMetropolisHasting.h>
-#include <continuator/moNeighborBestStat.h>
-#include <sampling/moFitnessCloudSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moMetropolisHasting.h"
+#include"../continuator/moNeighborBestStat.h"
+#include "moFitnessCloudSampling.h"
 
 /**
  * To compute an estimation of the fitness cloud,
diff --git a/mo/src/sampling/moMHRndFitnessCloudSampling.h b/mo/src/sampling/moMHRndFitnessCloudSampling.h
index 292d42344..c51b4a034 100644
--- a/mo/src/sampling/moMHRndFitnessCloudSampling.h
+++ b/mo/src/sampling/moMHRndFitnessCloudSampling.h
@@ -35,13 +35,13 @@
 #ifndef moMHRndFitnessCloudSampling_h
 #define moMHRndFitnessCloudSampling_h
 
-#include <eoInit.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moMetropolisHasting.h>
-#include <continuator/moNeighborFitnessStat.h>
-#include <sampling/moFitnessCloudSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moMetropolisHasting.h"
+#include "../continuator/moNeighborFitnessStat.h"
+#include "moFitnessCloudSampling.h"
 
 /**
  * To compute an estimation of the fitness cloud,
diff --git a/mo/src/sampling/moNeutralDegreeSampling.h b/mo/src/sampling/moNeutralDegreeSampling.h
index 397a3bd43..ddc9fa6d6 100644
--- a/mo/src/sampling/moNeutralDegreeSampling.h
+++ b/mo/src/sampling/moNeutralDegreeSampling.h
@@ -35,15 +35,15 @@
 #ifndef moNeutralDegreeSampling_h
 #define moNeutralDegreeSampling_h
 
-#include <eoInit.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomSearch.h>
-#include <continuator/moFitnessStat.h>
-#include <continuator/moNeighborhoodStat.h>
-#include <continuator/moNeutralDegreeNeighborStat.h>
-#include <sampling/moSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moRandomSearch.h"
+#include "../continuator/moFitnessStat.h"
+#include "../continuator/moNeighborhoodStat.h"
+#include "../continuator/moNeutralDegreeNeighborStat.h"
+#include "moSampling.h"
 
 /**
  * To compute the neutral degree:
diff --git a/mo/src/sampling/moNeutralWalkSampling.h b/mo/src/sampling/moNeutralWalkSampling.h
index 0db5f6c06..2cc9c82c9 100644
--- a/mo/src/sampling/moNeutralWalkSampling.h
+++ b/mo/src/sampling/moNeutralWalkSampling.h
@@ -35,27 +35,30 @@
 #ifndef moNeutralWalkSampling_h
 #define moNeutralWalkSampling_h
 
-#include <eoInit.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomNeutralWalk.h>
-#include <sampling/moSampling.h>
-#include <perturb/moSolInit.h>
-#include <continuator/moSolutionStat.h>
-#include <utils/eoDistance.h>
-#include <continuator/moDistanceStat.h>
-#include <continuator/moNeighborhoodStat.h>
-#include <continuator/moMaxNeighborStat.h>
-#include <continuator/moMinNeighborStat.h>
-#include <continuator/moQ1NeighborStat.h>
-#include <continuator/moQ3NeighborStat.h>
-#include <continuator/moMedianNeighborStat.h>
-#include <continuator/moAverageFitnessNeighborStat.h>
-#include <continuator/moStdFitnessNeighborStat.h>
-#include <continuator/moSizeNeighborStat.h>
-#include <continuator/moNbInfNeighborStat.h>
-#include <continuator/moNbSupNeighborStat.h>
-#include <continuator/moNeutralDegreeNeighborStat.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+
+#include "../algo/moRandomNeutralWalk.h"
+#include "moSampling.h"
+#include "../perturb/moSolInit.h"
+#include "../continuator/moSolutionStat.h"
+
+#include <paradiseo/eo/utils/eoDistance.h>
+
+#include "../continuator/moDistanceStat.h"
+#include "../continuator/moNeighborhoodStat.h"
+#include "../continuator/moMaxNeighborStat.h"
+#include "../continuator/moMinNeighborStat.h"
+#include "../continuator/moQ1NeighborStat.h"
+#include "../continuator/moQ3NeighborStat.h"
+#include "../continuator/moMedianNeighborStat.h"
+#include "../continuator/moAverageFitnessNeighborStat.h"
+#include "../continuator/moStdFitnessNeighborStat.h"
+#include "../continuator/moSizeNeighborStat.h"
+#include "../continuator/moNbInfNeighborStat.h"
+#include "../continuator/moNbSupNeighborStat.h"
+#include "../continuator/moNeutralDegreeNeighborStat.h"
 
 /**
  * To explore the evolvability of solutions in a neutral networks:
diff --git a/mo/src/sampling/moRndBestFitnessCloudSampling.h b/mo/src/sampling/moRndBestFitnessCloudSampling.h
index 371aead94..b1545b60c 100644
--- a/mo/src/sampling/moRndBestFitnessCloudSampling.h
+++ b/mo/src/sampling/moRndBestFitnessCloudSampling.h
@@ -35,13 +35,13 @@
 #ifndef moRndBestFitnessCloudSampling_h
 #define moRndBestFitnessCloudSampling_h
 
-#include <eoInit.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomSearch.h>
-#include <continuator/moNeighborBestStat.h>
-#include <sampling/moFitnessCloudSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moRandomSearch.h"
+#include "../continuator/moNeighborBestStat.h"
+#include "moFitnessCloudSampling.h"
 
 /**
  * To compute an estimation of the fitness cloud,
diff --git a/mo/src/sampling/moRndRndFitnessCloudSampling.h b/mo/src/sampling/moRndRndFitnessCloudSampling.h
index db6ddb984..00b5b0347 100644
--- a/mo/src/sampling/moRndRndFitnessCloudSampling.h
+++ b/mo/src/sampling/moRndRndFitnessCloudSampling.h
@@ -35,13 +35,13 @@
 #ifndef moRndRndFitnessCloudSampling_h
 #define moRndRndFitnessCloudSampling_h
 
-#include <eoInit.h>
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moEval.h>
-#include <eoEvalFunc.h>
-#include <algo/moRandomSearch.h>
-#include <continuator/moNeighborFitnessStat.h>
-#include <sampling/moFitnessCloudSampling.h>
+#include <paradiseo/eo/eoInit.h>
+#include "../neighborhood/moNeighborhood.h"
+#include "../eval/moEval.h"
+#include <paradiseo/eo/eoEvalFunc.h>
+#include "../algo/moRandomSearch.h"
+#include "../continuator/moNeighborFitnessStat.h"
+#include "moFitnessCloudSampling.h"
 
 /**
  * To compute an estimation of the fitness cloud,
diff --git a/mo/src/sampling/moSampling.h b/mo/src/sampling/moSampling.h
index c2db1fa73..a85a5c7b1 100644
--- a/mo/src/sampling/moSampling.h
+++ b/mo/src/sampling/moSampling.h
@@ -40,13 +40,16 @@
 #include <iostream>
 #include <sstream>
 #include <cstdlib>
-#include <eoFunctor.h>
-#include <utils/eoMonitor.h>
-#include <continuator/moStat.h>
-#include <continuator/moCheckpoint.h>
-#include <continuator/moVectorMonitor.h>
-#include <algo/moLocalSearch.h>
-#include <eoInit.h>
+
+#include <paradiseo/eo/eoFunctor.h>
+#include <paradiseo/eo/utils/eoMonitor.h>
+
+#include "../continuator/moStat.h"
+#include "../continuator/moCheckpoint.h"
+#include "../continuator/moVectorMonitor.h"
+#include "../algo/moLocalSearch.h"
+
+#include <paradiseo/eo/eoInit.h>
 
 
 /**
diff --git a/mo/src/sampling/moStatistics.h b/mo/src/sampling/moStatistics.h
index 7c74cbc16..9e2926954 100644
--- a/mo/src/sampling/moStatistics.h
+++ b/mo/src/sampling/moStatistics.h
@@ -37,7 +37,7 @@
 
 #include <vector>
 #include <cmath>
-#include <utils/eoDistance.h>
+#include <paradiseo/eo/utils/eoDistance.h>
 
 /**
  * Tools to compute some basic statistics