diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h
index b41465813..7b9c809e4 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h
@@ -41,10 +41,10 @@
 
 #include <eoPop.h>
 #include <eoEvalFunc.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 
 /*
- * Fitness assignment scheme which use weight foreach objectives
+ * Fitness assignment scheme which use weight for each objective
  */
 template < class MOEOT >
 class moeoAggregationFitnessAssignment : public moeoSingleObjectivization < MOEOT >
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h
index 9096a1335..c87ee3514 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h
@@ -40,7 +40,7 @@
 #define MOEOCONSTRAINTFITNESSASSIGNMENT_H_
 
 #include <eoPop.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <utils/moeoObjectiveVectorNormalizer.h>
 
 /*
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoSingleObjectivization.h b/trunk/paradiseo-moeo/src/fitness/moeoSingleObjectivization.h
similarity index 100%
rename from trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoSingleObjectivization.h
rename to trunk/paradiseo-moeo/src/fitness/moeoSingleObjectivization.h
diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo
index c629476fa..3e5db4142 100644
--- a/trunk/paradiseo-moeo/src/moeo
+++ b/trunk/paradiseo-moeo/src/moeo
@@ -113,7 +113,6 @@
 #include <explorer/moeoSimpleSubNeighborhoodExplorer.h>
 #include <explorer/moeoSubNeighborhoodExplorer.h>
 
-
 #include <fitness/moeoAggregationFitnessAssignment.h>
 #include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h>
 #include <fitness/moeoConstraintFitnessAssignment.h>
@@ -129,6 +128,7 @@
 #include <fitness/moeoIndicatorBasedFitnessAssignment.h>
 #include <fitness/moeoReferencePointIndicatorBasedFitnessAssignment.h>
 #include <fitness/moeoScalarFitnessAssignment.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h>
 
 #include <hybridization/moeoDMLSGenUpdater.h>
@@ -176,7 +176,6 @@
 #include <scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h>
 #include <scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h>
 #include <scalarStuffs/fitness/moeoMetricFitnessAssignment.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h>
 #include <scalarStuffs/weighting/moeoAnytimeWeightStrategy.h>
 #include <scalarStuffs/weighting/moeoAugmentedQexploreWeightStrategy.h>
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h
index 25cb7bce4..8c922b1b3 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h
@@ -37,7 +37,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef __moeoHC_h
 #define __moeoHC_h
 #include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h>
 #include <scalarStuffs/algo/moeoSolAlgo.h>
 #include <moHC.h>
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h
index ff40b0a48..37b9ea8f7 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h
@@ -47,7 +47,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eoEvalFunc.h>
 #include <scalarStuffs/algo/moeoSolAlgo.h>
 #include <moHCMoveLoopExpl.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
 
 //! Iterated Local Search (ILS)
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h
index 8449f75e9..9b1615a2f 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h
@@ -40,7 +40,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eoEvalFunc.h>
 #include <scalarStuffs/algo/moeoSolAlgo.h>
 #include <moTSMoveLoopExpl.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/explorer/moeoTSMoveLoopExpl.h>
 #include <moSA.h>
 //! Simulated annealing (SA)
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h
index e20ce230f..4eadcb289 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h
@@ -40,7 +40,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <moTS.h>
 #include <eoEvalFunc.h>
 #include <scalarStuffs/algo/moeoSolAlgo.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/explorer/moeoTSMoveLoopExpl.h>
 //! Tabu Search (TS)
 /*!
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h
index 429703f4c..507063322 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h
@@ -41,7 +41,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 #include <eoEvalFunc.h>
 #include <scalarStuffs/algo/moeoSolAlgo.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <fitness/moeoAggregationFitnessAssignment.h>
 #include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
 #include <scalarStuffs/weighting/moeoVariableWeightStrategy.h>
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h
index 9af0c265d..3d3668174 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h
@@ -41,7 +41,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eoEvalFunc.h>
 #include <scalarStuffs/algo/moeoSolAlgo.h>
 #include <moHCMoveLoopExpl.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
 //! Variable Neighbors Search (VNS)
 /*!
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h
index 1e6f91a5a..e396a798b 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h
@@ -40,7 +40,7 @@
 #define MOEOASFAFITNESSASSIGNMENT_H_
 
 #include <eoPop.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <scalarStuffs/distance/moeoAchievementScalarizingFunctionDistance.h>
 #include <metric/moeoDistanceMetric.h>
 #include <utils/moeoObjectiveVectorNormalizer.h>
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h
index 647802a56..b0a1499bd 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h
@@ -43,7 +43,7 @@
 #include <eo>
 #include <vector>
 #include <eoPop.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <utils/moeoObjectiveVectorNormalizer.h>
 #include <scalarStuffs/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h>
 
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h
index 62038ef77..356ac2144 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h
@@ -40,7 +40,7 @@
 #define MOEOAUGCHEVMETRICFITNESSASSIGNMENT_H_
 
 #include <eoPop.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <utils/moeoObjectiveVectorNormalizer.h>
 
 /*
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h
index 96dbee494..d316e6cc3 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h
@@ -42,7 +42,7 @@
 #include <eo>
 #include <moMoveIncrEval.h>
 #include <fitness/moeoFitnessAssignment.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <eoEvalFunc.h>
 
 /**
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h
index 976fb7c34..f5c3e5549 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h
@@ -43,7 +43,7 @@
 #include <eo>
 #include <vector>
 #include <eoPop.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <utils/moeoObjectiveVectorNormalizer.h>
 
 /*
diff --git a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h
index d16bc53cc..382d4e2ef 100644
--- a/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h
@@ -43,7 +43,7 @@
 #include <eo>
 #include <vector>
 #include <eoPop.h>
-#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
+#include <fitness/moeoSingleObjectivization.h>
 #include <utils/moeoObjectiveVectorNormalizer.h>
 #include <scalarStuffs/distance/moeoWeightedChebychevDistance.h>