diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt
index 7ca352cc3..eb668f9e7 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/CMakeLists.txt
@@ -50,8 +50,8 @@ IF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CM
 			${MO_SRC_DIR}/tutorial/Lesson5/param
 			${MO_BIN_DIR}/tutorial/Lesson5/param
     	COMMAND ${CMAKE_COMMAND} -E copy_if_different
-			${MO_SRC_DIR}/tutorial/Lesson6/param
-			${MO_BIN_DIR}/tutorial/Lesson6/param
+			${MO_SRC_DIR}/tutorial/HybridLesson/param
+			${MO_BIN_DIR}/tutorial/HybridLesson/param
 	)
 ENDIF(ENABLE_CMAKE_EXAMPLE OR CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 
@@ -116,61 +116,56 @@ MACRO(ADD_COMMANDS_MO)
 	ADD_CUSTOM_COMMAND(
 	    OUTPUT ${MO_BIN_DIR}/tutorial/Lesson6/param
 	    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-	    	${MO_SRC_DIR}/tutorial/Lesson6/param
-	    	${MO_BIN_DIR}/tutorial/Lesson6
+	    	${MO_SRC_DIR}/tutorial/HybridLesson/param
+	    	${MO_BIN_DIR}/tutorial/HybridLesson
 	)
 ENDMACRO(ADD_COMMANDS_MO)
 
 MACRO(ADD_TARGET_MO n)
 	IF(${n} STREQUAL "lesson1")
-		ADD_CUSTOM_TARGET(lesson1 DEPENDS
+		ADD_CUSTOM_TARGET(lesson1 DEPENDS 
 			${MO_BIN_DIR}/tutorial/Lesson1/param
-			${MO_BIN_DIR}/tutorial/Lesson1/minimize_function
+			${MO_BIN_DIR}/tutorial/Lesson1/hill_climbing
+			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
+			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
+			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
+			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
+			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
 		)
-	ELSEIF(${n} STREQUAL "lesson2")
+	ELSEIF(${n} STREQUAL "lesson2")	
 		ADD_CUSTOM_TARGET(lesson2 DEPENDS 
 			${MO_BIN_DIR}/tutorial/Lesson2/param
-			${MO_BIN_DIR}/tutorial/Lesson2/hill_climbing
+			${MO_BIN_DIR}/tutorial/Lesson2/tabu_search
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
 		)
-	ELSEIF(${n} STREQUAL "lesson3")	
-		ADD_CUSTOM_TARGET(lesson3 DEPENDS 
+	ELSEIF(${n} STREQUAL "lesson3")			
+		ADD_CUSTOM_TARGET(lesson3 DEPENDS
 			${MO_BIN_DIR}/tutorial/Lesson3/param
-			${MO_BIN_DIR}/tutorial/Lesson3/tabu_search
+			${MO_BIN_DIR}/tutorial/Lesson3/simulated_annealing
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
 		)
-	ELSEIF(${n} STREQUAL "lesson4")			
-		ADD_CUSTOM_TARGET(lesson4 DEPENDS
+	ELSEIF(${n} STREQUAL "lesson4")				
+		ADD_CUSTOM_TARGET(lesson4 DEPENDS 
 			${MO_BIN_DIR}/tutorial/Lesson4/param
-			${MO_BIN_DIR}/tutorial/Lesson4/simulated_annealing
+			${MO_BIN_DIR}/tutorial/Lesson4/iterated_local_search
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
 		)
-	ELSEIF(${n} STREQUAL "lesson5")				
-		ADD_CUSTOM_TARGET(lesson5 DEPENDS 
-			${MO_BIN_DIR}/tutorial/Lesson5/param
-			${MO_BIN_DIR}/tutorial/Lesson5/iterated_local_search
-			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
-			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
-			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
-			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/rl5915.tsp
-			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/usa13509.tsp
-		)
-	ELSEIF(${n} STREQUAL "lesson6")		
-		ADD_CUSTOM_TARGET(lesson6 DEPENDS 
-			${MO_BIN_DIR}/tutorial/Lesson6/param
-			${MO_BIN_DIR}/tutorial/Lesson6/hybrid_ga
+	ELSEIF(${n} STREQUAL "hybridlesson")		
+		ADD_CUSTOM_TARGET(hybridlesson DEPENDS 
+			${MO_BIN_DIR}/tutorial/HybridLesson/param
+			${MO_BIN_DIR}/tutorial/HybridLesson/hybrid_ga
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
@@ -184,7 +179,7 @@ MACRO(ADD_TARGET_MO n)
 			${MO_BIN_DIR}/tutorial/Lesson3/param
 			${MO_BIN_DIR}/tutorial/Lesson4/param
 			${MO_BIN_DIR}/tutorial/Lesson5/param
-			${MO_BIN_DIR}/tutorial/Lesson6/param
+			${MO_BIN_DIR}/tutorial/HybridLesson/param
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/berlin52.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/eil101.tsp
 			${MO_BIN_DIR}/tutorial/examples/tsp/benchs/pr2392.tsp
@@ -214,4 +209,4 @@ ADD_SUBDIRECTORY(Lesson2)
 ADD_SUBDIRECTORY(Lesson3)
 ADD_SUBDIRECTORY(Lesson4)
 ADD_SUBDIRECTORY(Lesson5)
-ADD_SUBDIRECTORY(Lesson6)
+ADD_SUBDIRECTORY(HybridLesson)
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/CMakeLists.txt
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/CMakeLists.txt
rename to branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/CMakeLists.txt
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/hybrid_ga.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/hybrid_ga.cpp
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/hybrid_ga.cpp
rename to branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/hybrid_ga.cpp
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/param b/branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/param
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson6/param
rename to branches/cmakemodif/paradiseo-mo/tutorial/HybridLesson/param
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
index 1c0437cf1..c8acaed41 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt
@@ -5,54 +5,65 @@
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
 INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
-INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR})
-
+INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 ######################################################################################
 
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
 
-LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib)
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
 
 ######################################################################################
 
 
+
 ######################################################################################
 ### 3) Define your target(s): just an executable here
 ######################################################################################
 
 IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-	SOURCE_GROUP(src FILES minimize_function.cpp)	
-	ADD_EXECUTABLE(minimize_function 
-		minimize_function.cpp
+	SOURCE_GROUP(src FILES hill_climbing.cpp)
+	
+	SOURCE_GROUP(benchs FILES
+		${TSP_BIN_DIR}/benchs/berlin52.tsp
+		${TSP_BIN_DIR}/benchs/eil101.tsp
+		${TSP_BIN_DIR}/benchs/pr2392.tsp
+		${TSP_BIN_DIR}/benchs/rl5915.tsp
+		${TSP_BIN_DIR}/benchs/usa13509.tsp
+	)
+		
+	ADD_EXECUTABLE(hill_climbing
+		hill_climbing.cpp
 		${MO_BIN_DIR}/tutorial/Lesson1/param
-	) 
-ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
+		${TSP_BIN_DIR}/benchs/berlin52.tsp
+		${TSP_BIN_DIR}/benchs/eil101.tsp
+		${TSP_BIN_DIR}/benchs/pr2392.tsp
+		${TSP_BIN_DIR}/benchs/rl5915.tsp
+		${TSP_BIN_DIR}/benchs/usa13509.tsp
+	)
+ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")	
 	ADD_COMMANDS_MO()
 	ADD_TARGET_MO(lesson1)
 	IF(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(minimize_function minimize_function.cpp)
-	ELSE(ENABLE_CMAKE_EXAMPLE)	
-		ADD_EXECUTABLE(minimize_function EXCLUDE_FROM_ALL minimize_function.cpp)
-	ENDIF(ENABLE_CMAKE_EXAMPLE) 		
+		ADD_EXECUTABLE(hill_climbing hill_climbing.cpp)
+	ELSE(ENABLE_CMAKE_EXAMPLE)
+		ADD_EXECUTABLE(hill_climbing EXCLUDE_FROM_ALL hill_climbing.cpp)
+	ENDIF(ENABLE_CMAKE_EXAMPLE)
 ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 
-ADD_DEPENDENCIES(minimize_function function)
 
+ADD_DEPENDENCIES(hill_climbing tsp)
 ######################################################################################
 
 
 
-
-
 ######################################################################################
 ### 4) Optionnal: define your target(s)'s version: no effect for windows
 ######################################################################################
 
-
-SET(MINIMIZEFUNCTION_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_VERSION}")
+SET(HILLCLIMBING_VERSION ${GLOBAL_VERSION})
+SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}")
 ######################################################################################
 
 
@@ -61,6 +72,7 @@ SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_V
 ### 5) Link the librairies for your target(s)
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(minimize_function function eo eoutils) 
+TARGET_LINK_LIBRARIES(hill_climbing tsp eo eoutils) 
 
 ######################################################################################
+
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/hill_climbing.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/hill_climbing.cpp
rename to branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/param b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/param
index 726b2e29f..8bdb97f37 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/param
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/param
@@ -4,7 +4,6 @@
 # --stopOnUnknownParam=1                   # Stop if unkown param entered
 
 ######    Configuration           ######
-# --initialBound=1                         # Bound for the initial affectation.
-# --searchBound=1                          # Bound for neighbourhood exploration.
-# --searchStep=1                           # Step between two values during the neighbourhood exploration.
-# --selectionType=First                    # Type of the selection: 'Best', 'First' or 'Random'.
+# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
+# --seed=1203517190                        # Seed for rand.
+# --selectionType=Best                     # Type of the selection: 'Best', 'First' or 'Random'.
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
index 1094c23cc..414d8baaa 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/CMakeLists.txt
@@ -1,3 +1,5 @@
+
+
 ######################################################################################
 ### 1) Include the sources
 ######################################################################################
@@ -22,8 +24,10 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
 ### 3) Define your target(s): just an executable here
 ######################################################################################
 
+
+
 IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-	SOURCE_GROUP(src FILES hill_climbing.cpp)
+	SOURCE_GROUP(src FILES tabu_search.cpp)
 	
 	SOURCE_GROUP(benchs FILES
 		${TSP_BIN_DIR}/benchs/berlin52.tsp
@@ -32,9 +36,9 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "
 		${TSP_BIN_DIR}/benchs/rl5915.tsp
 		${TSP_BIN_DIR}/benchs/usa13509.tsp
 	)
-		
-	ADD_EXECUTABLE(hill_climbing
-		hill_climbing.cpp
+	
+	ADD_EXECUTABLE(tabu_search
+		tabu_search.cpp
 		${MO_BIN_DIR}/tutorial/Lesson2/param
 		${TSP_BIN_DIR}/benchs/berlin52.tsp
 		${TSP_BIN_DIR}/benchs/eil101.tsp
@@ -42,18 +46,17 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "
 		${TSP_BIN_DIR}/benchs/rl5915.tsp
 		${TSP_BIN_DIR}/benchs/usa13509.tsp
 	)
-ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")	
+ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 	ADD_COMMANDS_MO()
 	ADD_TARGET_MO(lesson2)
 	IF(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(hill_climbing hill_climbing.cpp)
+		ADD_EXECUTABLE(tabu_search tabu_search.cpp)
 	ELSE(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(hill_climbing EXCLUDE_FROM_ALL hill_climbing.cpp)
+		ADD_EXECUTABLE(tabu_search EXCLUDE_FROM_ALL tabu_search.cpp)
 	ENDIF(ENABLE_CMAKE_EXAMPLE)
 ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 
-
-ADD_DEPENDENCIES(hill_climbing tsp)
+ADD_DEPENDENCIES(tabu_search tsp)
 ######################################################################################
 
 
@@ -62,8 +65,8 @@ ADD_DEPENDENCIES(hill_climbing tsp)
 ### 4) Optionnal: define your target(s)'s version: no effect for windows
 ######################################################################################
 
-SET(HILLCLIMBING_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}")
+SET(TABUSEARCH_VERSION ${GLOBAL_VERSION})
+SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}")
 ######################################################################################
 
 
@@ -72,7 +75,7 @@ SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}"
 ### 5) Link the librairies for your target(s)
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(hill_climbing tsp eo eoutils) 
+TARGET_LINK_LIBRARIES(tabu_search tsp eo eoutils) 
 
 ######################################################################################
 
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/param b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/param
index 8bdb97f37..53d46bed9 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/param
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/param
@@ -4,6 +4,8 @@
 # --stopOnUnknownParam=1                   # Stop if unkown param entered
 
 ######    Configuration           ######
-# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
-# --seed=1203517190                        # Seed for rand.
-# --selectionType=Best                     # Type of the selection: 'Best', 'First' or 'Random'.
+# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance
+# --seed=1202917905                        # Seed for rand
+# --tabuListSize=10                        # Size of the tabu list
+# --maxIter=1000                           # Maximum number of iterations
+# --tabuListType=TwoOpt                    # Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/tabu_search.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/tabu_search.cpp
rename to branches/cmakemodif/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
index 95380a214..9ff67e176 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-
 ######################################################################################
 ### 1) Include the sources
 ######################################################################################
@@ -13,7 +12,7 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
-
+ 
 LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
 
 ######################################################################################
@@ -24,10 +23,8 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
 ### 3) Define your target(s): just an executable here
 ######################################################################################
 
-
-
 IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-	SOURCE_GROUP(src FILES tabu_search.cpp)
+	SOURCE_GROUP(src FILES simulated_annealing.cpp)
 	
 	SOURCE_GROUP(benchs FILES
 		${TSP_BIN_DIR}/benchs/berlin52.tsp
@@ -36,9 +33,9 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "
 		${TSP_BIN_DIR}/benchs/rl5915.tsp
 		${TSP_BIN_DIR}/benchs/usa13509.tsp
 	)
-	
-	ADD_EXECUTABLE(tabu_search
-		tabu_search.cpp
+		
+	ADD_EXECUTABLE(simulated_annealing
+		simulated_annealing.cpp
 		${MO_BIN_DIR}/tutorial/Lesson3/param
 		${TSP_BIN_DIR}/benchs/berlin52.tsp
 		${TSP_BIN_DIR}/benchs/eil101.tsp
@@ -50,13 +47,13 @@ ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL
 	ADD_COMMANDS_MO()
 	ADD_TARGET_MO(lesson3)
 	IF(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(tabu_search tabu_search.cpp)
-	ELSE(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(tabu_search EXCLUDE_FROM_ALL tabu_search.cpp)
+		ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp)
+	ELSE(ENABLE_CMAKE_EXAMPLE)	
+		ADD_EXECUTABLE(simulated_annealing EXCLUDE_FROM_ALL simulated_annealing.cpp)
 	ENDIF(ENABLE_CMAKE_EXAMPLE)
 ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 
-ADD_DEPENDENCIES(tabu_search tsp)
+ADD_DEPENDENCIES(simulated_annealing tsp)
 ######################################################################################
 
 
@@ -65,8 +62,8 @@ ADD_DEPENDENCIES(tabu_search tsp)
 ### 4) Optionnal: define your target(s)'s version: no effect for windows
 ######################################################################################
 
-SET(TABUSEARCH_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}")
+SET(SIMULATEDANNEALING_VERSION ${GLOBAL_VERSION})
+SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}")
 ######################################################################################
 
 
@@ -75,7 +72,7 @@ SET_TARGET_PROPERTIES(tabu_search PROPERTIES VERSION "${TABUSEARCH_VERSION}")
 ### 5) Link the librairies for your target(s)
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(tabu_search tsp eo eoutils) 
+TARGET_LINK_LIBRARIES(simulated_annealing tsp eo eoutils) 
 
 ######################################################################################
 
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/param b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/param
index 53d46bed9..d80626b17 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/param
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/param
@@ -4,8 +4,11 @@
 # --stopOnUnknownParam=1                   # Stop if unkown param entered
 
 ######    Configuration           ######
-# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance
-# --seed=1202917905                        # Seed for rand
-# --tabuListSize=10                        # Size of the tabu list
-# --maxIter=1000                           # Maximum number of iterations
-# --tabuListType=TwoOpt                    # Type of the tabu list: 'TwoOpt', 'SimpleMove' or 'SimpleSolution'
+# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
+# --seed=1202919978                        # Seed for rand.
+# --maxIter=1000                           # Maximum number of iterations.
+# --initialTemp=1000                       # Initial temperature.
+# --threshold=0.1                          # Minimum temperature allowed.
+# --expoRatio=0.98                         # Ratio used if exponential cooling schedule is chosen.
+# --lineaRatio=0.5                         # Ratio used if linear cooling schedule is chosen.
+# --coolSchedType=Expo                     # Type the cooling schedule: 'Expo' or 'Linear'.
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/simulated_annealing.cpp
rename to branches/cmakemodif/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
index c925f4117..0bfb57c7a 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+
 ######################################################################################
 ### 1) Include the sources
 ######################################################################################
@@ -12,8 +13,8 @@ INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
- 
-LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
+
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) 
 
 ######################################################################################
 
@@ -24,7 +25,7 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib)
 ######################################################################################
 
 IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-	SOURCE_GROUP(src FILES simulated_annealing.cpp)
+	SOURCE_GROUP(src FILES iterated_local_search.cpp)
 	
 	SOURCE_GROUP(benchs FILES
 		${TSP_BIN_DIR}/benchs/berlin52.tsp
@@ -33,27 +34,28 @@ IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "
 		${TSP_BIN_DIR}/benchs/rl5915.tsp
 		${TSP_BIN_DIR}/benchs/usa13509.tsp
 	)
-		
-	ADD_EXECUTABLE(simulated_annealing
-		simulated_annealing.cpp
+			
+	ADD_EXECUTABLE(iterated_local_search
+		iterated_local_search.cpp
 		${MO_BIN_DIR}/tutorial/Lesson4/param
 		${TSP_BIN_DIR}/benchs/berlin52.tsp
 		${TSP_BIN_DIR}/benchs/eil101.tsp
 		${TSP_BIN_DIR}/benchs/pr2392.tsp
 		${TSP_BIN_DIR}/benchs/rl5915.tsp
 		${TSP_BIN_DIR}/benchs/usa13509.tsp
-	)
+	) 
 ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 	ADD_COMMANDS_MO()
 	ADD_TARGET_MO(lesson4)
 	IF(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(simulated_annealing simulated_annealing.cpp)
-	ELSE(ENABLE_CMAKE_EXAMPLE)	
-		ADD_EXECUTABLE(simulated_annealing EXCLUDE_FROM_ALL simulated_annealing.cpp)
-	ENDIF(ENABLE_CMAKE_EXAMPLE)
+		ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) 
+	ELSE(ENABLE_CMAKE_EXAMPLE)
+		ADD_EXECUTABLE(iterated_local_search EXCLUDE_FROM_ALL iterated_local_search.cpp) 
+	ENDIF(ENABLE_CMAKE_EXAMPLE)	
 ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
 
-ADD_DEPENDENCIES(simulated_annealing tsp)
+ADD_DEPENDENCIES(iterated_local_search tsp)
+
 ######################################################################################
 
 
@@ -62,8 +64,8 @@ ADD_DEPENDENCIES(simulated_annealing tsp)
 ### 4) Optionnal: define your target(s)'s version: no effect for windows
 ######################################################################################
 
-SET(SIMULATEDANNEALING_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALING_VERSION}")
+SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION})
+SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}")
 ######################################################################################
 
 
@@ -72,7 +74,6 @@ SET_TARGET_PROPERTIES(simulated_annealing PROPERTIES VERSION "${SIMULATEDANNEALI
 ### 5) Link the librairies for your target(s)
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(simulated_annealing tsp eo eoutils) 
+TARGET_LINK_LIBRARIES(iterated_local_search tsp eo eoutils) 
 
 ######################################################################################
-
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/iterated_local_search.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/iterated_local_search.cpp
rename to branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/param b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/param
index d80626b17..91a5284c8 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/param
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson4/param
@@ -5,10 +5,5 @@
 
 ######    Configuration           ######
 # --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
-# --seed=1202919978                        # Seed for rand.
+# --seed=1203080388                        # Seed for rand.
 # --maxIter=1000                           # Maximum number of iterations.
-# --initialTemp=1000                       # Initial temperature.
-# --threshold=0.1                          # Minimum temperature allowed.
-# --expoRatio=0.98                         # Ratio used if exponential cooling schedule is chosen.
-# --lineaRatio=0.5                         # Ratio used if linear cooling schedule is chosen.
-# --coolSchedType=Expo                     # Type the cooling schedule: 'Expo' or 'Linear'.
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param b/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param
deleted file mode 100644
index 91a5284c8..000000000
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/param
+++ /dev/null
@@ -1,9 +0,0 @@
-
-######                 General    ######
-# --help=0                                 # -h : Prints this message
-# --stopOnUnknownParam=1                   # Stop if unkown param entered
-
-######    Configuration           ######
-# --instancePath=../examples/tsp/benchs/berlin52.tsp # Path to the instance.
-# --seed=1203080388                        # Seed for rand.
-# --maxIter=1000                           # Maximum number of iterations.
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt b/branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/CMakeLists.txt
similarity index 53%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt
rename to branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/CMakeLists.txt
index 10b4b8b5e..ec696bbf6 100644
--- a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson5/CMakeLists.txt
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
 ######################################################################################
 ### 1) Include the sources
 ######################################################################################
@@ -7,65 +5,39 @@
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
 INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
-INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
+INCLUDE_DIRECTORIES(${FUNCTION_SRC_DIR})
+
 ######################################################################################
 
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
 
-LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BIN_DIR}/lib) 
+LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${FUNCTION_BIN_DIR}/lib)
 
 ######################################################################################
 
 
-
 ######################################################################################
 ### 3) Define your target(s): just an executable here
 ######################################################################################
 
-IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-	SOURCE_GROUP(src FILES iterated_local_search.cpp)
-	
-	SOURCE_GROUP(benchs FILES
-		${TSP_BIN_DIR}/benchs/berlin52.tsp
-		${TSP_BIN_DIR}/benchs/eil101.tsp
-		${TSP_BIN_DIR}/benchs/pr2392.tsp
-		${TSP_BIN_DIR}/benchs/rl5915.tsp
-		${TSP_BIN_DIR}/benchs/usa13509.tsp
-	)
-			
-	ADD_EXECUTABLE(iterated_local_search
-		iterated_local_search.cpp
-		${MO_BIN_DIR}/tutorial/Lesson5/param
-		${TSP_BIN_DIR}/benchs/berlin52.tsp
-		${TSP_BIN_DIR}/benchs/eil101.tsp
-		${TSP_BIN_DIR}/benchs/pr2392.tsp
-		${TSP_BIN_DIR}/benchs/rl5915.tsp
-		${TSP_BIN_DIR}/benchs/usa13509.tsp
-	) 
-ELSE(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-	ADD_COMMANDS_MO()
-	ADD_TARGET_MO(lesson5)
-	IF(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(iterated_local_search iterated_local_search.cpp) 
-	ELSE(ENABLE_CMAKE_EXAMPLE)
-		ADD_EXECUTABLE(iterated_local_search EXCLUDE_FROM_ALL iterated_local_search.cpp) 
-	ENDIF(ENABLE_CMAKE_EXAMPLE)	
-ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005" OR CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")
-
-ADD_DEPENDENCIES(iterated_local_search tsp)
+ADD_EXECUTABLE(minimize_function 
+ADD_DEPENDENCIES(minimize_function function)
 
 ######################################################################################
 
 
 
+
+
 ######################################################################################
 ### 4) Optionnal: define your target(s)'s version: no effect for windows
 ######################################################################################
 
-SET(ITERATEDLOCALSEARCH_VERSION ${GLOBAL_VERSION})
-SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALSEARCH_VERSION}")
+
+SET(MINIMIZEFUNCTION_VERSION ${GLOBAL_VERSION})
+SET_TARGET_PROPERTIES(minimize_function PROPERTIES VERSION "${MINIMIZEFUNCTION_VERSION}")
 ######################################################################################
 
 
@@ -74,6 +46,6 @@ SET_TARGET_PROPERTIES(iterated_local_search PROPERTIES VERSION "${ITERATEDLOCALS
 ### 5) Link the librairies for your target(s)
 ######################################################################################
 
-TARGET_LINK_LIBRARIES(iterated_local_search tsp eo eoutils) 
+TARGET_LINK_LIBRARIES(minimize_function function eo eoutils) 
 
 ######################################################################################
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/minimize_function.cpp b/branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/minimize_function.cpp
similarity index 100%
rename from branches/cmakemodif/paradiseo-mo/tutorial/Lesson1/minimize_function.cpp
rename to branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/minimize_function.cpp
diff --git a/branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/param b/branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/param
new file mode 100644
index 000000000..726b2e29f
--- /dev/null
+++ b/branches/cmakemodif/paradiseo-mo/tutorial/OldLesson/param
@@ -0,0 +1,10 @@
+
+######                 General    ######
+# --help=0                                 # -h : Prints this message
+# --stopOnUnknownParam=1                   # Stop if unkown param entered
+
+######    Configuration           ######
+# --initialBound=1                         # Bound for the initial affectation.
+# --searchBound=1                          # Bound for neighbourhood exploration.
+# --searchStep=1                           # Step between two values during the neighbourhood exploration.
+# --selectionType=First                    # Type of the selection: 'Best', 'First' or 'Random'.