diff --git a/trunk/installParadiseo.sh b/trunk/installParadiseo.sh
index c26ecef1a..fd8e2ef1f 100755
--- a/trunk/installParadiseo.sh
+++ b/trunk/installParadiseo.sh
@@ -404,7 +404,7 @@ function run_install_step()
 		echo -e  "	\033[40m\033[1;34m# STEP $currentStepCounter \033[0m "
 		echo '		--> Installing Paradiseo-MO. Please wait ...'
 	
-		execute_cmd "cd $installKitPath/paradiseo-mo" "[$currentStepCounter-1] Go in Paradiseo-MO dir"  $SPY 
+		execute_cmd "cd $installKitPath/paradiseo-mo/build" "[$currentStepCounter-1] Go in Paradiseo-MO dir"  $SPY 
 		RETURN=$?
 		execute_cmd "cmake . -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake"  $SPY
 		RETURN=`expr $RETURN + $?`
@@ -427,7 +427,7 @@ function run_install_step()
 		echo -e  "	\033[40m\033[1;34m# STEP $currentStepCounter \033[0m "
 		echo '		--> Installing Paradiseo-MOEO. Please wait ...'
 		
-		execute_cmd "cd $installKitPath/paradiseo-moeo" "[$currentStepCounter-1] Go in Paradiseo-MOEO dir"  $SPY 
+		execute_cmd "cd $installKitPath/paradiseo-moeo/build" "[$currentStepCounter-1] Go in Paradiseo-MOEO dir"  $SPY 
 		RETURN=$?
 		execute_cmd "cmake . -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake"  $SPY
 		RETURN=`expr $RETURN + $?`
@@ -663,7 +663,7 @@ function run_install_step()
 		echo -e  "	\033[40m\033[1;34m# STEP $currentStepCounter \033[0m "
 		echo '		--> Installing Paradiseo-PEO. Please wait ...'
 		
-		execute_cmd "cd $installKitPath/paradiseo-peo" "[$currentStepCounter-1] Go in Paradiseo-PEO dir"  $SPY 
+		execute_cmd "cd $installKitPath/paradiseo-peo/build" "[$currentStepCounter-1] Go in Paradiseo-PEO dir"  $SPY 
 		RETURN=$?
 		execute_cmd "cmake . -DEOdir=$installKitPath/paradiseo-eo/ -DMOdir=$installKitPath/paradiseo-mo" "[$currentStepCounter-2] Run CMake for ParadisEO-PEO"  $SPY
 		RETURN=`expr $RETURN + $?`
diff --git a/trunk/paradiseo-peo/CMakeLists.txt b/trunk/paradiseo-peo/CMakeLists.txt
index e263100d5..b9fff03b5 100644
--- a/trunk/paradiseo-peo/CMakeLists.txt
+++ b/trunk/paradiseo-peo/CMakeLists.txt
@@ -4,7 +4,7 @@
 ######################################################################################
 
 IF(WIN32)
-	MESSAGE (FATAL_ERROR "ParadisEO-PEO can not be generated on Windows systems")
+	#MESSAGE (FATAL_ERROR "ParadisEO-PEO can not be generated on Windows systems")
 ENDIF(WIN32)
 
 # check libxml2
@@ -36,12 +36,8 @@ INCLUDE(peo-conf.cmake OPTIONAL)
 ### 2) Main project config 
 ######################################################################################
 
-IF(NOT DEFINED ${PROJECT_NAME} OR ${PROJECT_NAME} STREQUAL "Project")
-    SET(PROJECT_NAME "ParadisEO-PEO")
-ENDIF(NOT DEFINED ${PROJECT_NAME} OR ${PROJECT_NAME} STREQUAL "Project")
-
 # set the project name
-PROJECT(${PROJECT_NAME})
+PROJECT(ParadisEO-PEO)
 
 # check cmake version compatibility
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4 FATAL_ERROR)
@@ -76,7 +72,7 @@ INCLUDE(CheckLibraryExists)
 ######################################################################################
 
 IF(NOT DEFINED PEO_DIR)
-  SET(PEO_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "ParadisEO-PEO main directory") 
+  SET(PEO_DIR ${ParadisEO-PEO_SOURCE_DIR} CACHE PATH "ParadisEO-PEO main directory") 
 ENDIF(NOT DEFINED PEO_DIR)
 
 # Need main EO directory path
@@ -104,11 +100,11 @@ IF(NOT DEFINED MO_SRC_DIR)
 ENDIF(NOT DEFINED MO_SRC_DIR)
 
 IF(NOT DEFINED PEO_SRC_DIR)
-  SET(PEO_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+  SET(PEO_SRC_DIR ${PEO_DIR}/src)
 ENDIF(NOT DEFINED PEO_SRC_DIR)
 
 IF(NOT DEFINED PEO_DOC_DIR)
-  SET(PEO_DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/doc)
+  SET(PEO_DOC_DIR ${PEO_DIR}/doc)
 ENDIF(NOT DEFINED PEO_DOC_DIR)
 ######################################################################################
 
@@ -149,6 +145,6 @@ ENDIF(NOT ${MO_DIR} MATCHES "${ABSOLUTE_PATH_REGEX}")
 ### 6) Where must cmake go now ?
 ######################################################################################
 
-SUBDIRS(doc src tutorial)
+SUBDIRS(doc src ) #tutorial)
 
 ######################################################################################
diff --git a/trunk/paradiseo-peo/peo-conf.cmake b/trunk/paradiseo-peo/peo-conf.cmake
index 471d96166..8fa260baa 100644
--- a/trunk/paradiseo-peo/peo-conf.cmake
+++ b/trunk/paradiseo-peo/peo-conf.cmake
@@ -3,31 +3,22 @@
 ######################################################################################
 ###  In this file, you can specify many CMake variables used to build paradisEO-PEO.
 ###  For example, if you don't want ot give the EO path each time on the command line,
-###  uncomment the line the "SET(PROJECT_NAME...)" and set your favorite name.
+###  uncomment the line the "SET(EO_DIR...)" and set your path.
 ###  The section numbers are the same as those used in the CMakeLists.txt file.
 ######################################################################################
 ######################################################################################
 
 
-######################################################################################
-### 0) OPTIONNAL - Overwrite project default config 
-######################################################################################
-  
-# SET(PROJECT_NAME "ParadisEO-PEO")
-
-######################################################################################
-
-
 ######################################################################################
 ### 3) OPTIONNAL - Overwrite default paths
 ######################################################################################
 
-# SET(MOEO_DIR "<your path>" CACHE PATH "ParadisEO-PEO main directory") 
+# SET(MO_DIR "<your path>" CACHE PATH "ParadisEO-PEO main directory") 
 # SET(EO_DIR "<path to ParadisEO-EO>" CACHE PATH "ParadisEO-EO main directory")
 
 # SET(EO_SRC_DIR "<path to ParadisEO-EO src dir>")
-# SET(MOEO_SRC_DIR "<path to ParadisEO-MO src dir>")
-# SET(MOEO_DOC_DIR "<path to ParadisEO-MO doc dir>")
+# SET(MO_SRC_DIR "<path to ParadisEO-MO src dir>")
+# SET(MO_DOC_DIR "<path to ParadisEO-MO doc dir>")
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/src/core/CMakeLists.txt b/trunk/paradiseo-peo/src/core/CMakeLists.txt
index 454c2d383..61adba4f6 100644
--- a/trunk/paradiseo-peo/src/core/CMakeLists.txt
+++ b/trunk/paradiseo-peo/src/core/CMakeLists.txt
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${EO_SRC_DIR})
 ### 2) Define your target(s): just the peo library here
 ######################################################################################
 
-SET(CORE_LIB_OUTPUT_PATH ${PEO_DIR}/build)
+SET(CORE_LIB_OUTPUT_PATH ${ParadisEO-PEO_BINARY_DIR}/lib)
 SET(LIBRARY_OUTPUT_PATH ${CORE_LIB_OUTPUT_PATH})
 
 SET (CORE_SOURCES 	peo_init.cpp
diff --git a/trunk/paradiseo-peo/src/rmc/mpi/CMakeLists.txt b/trunk/paradiseo-peo/src/rmc/mpi/CMakeLists.txt
index 7ea722f97..b275baef1 100644
--- a/trunk/paradiseo-peo/src/rmc/mpi/CMakeLists.txt
+++ b/trunk/paradiseo-peo/src/rmc/mpi/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(${XML2_CFLAGS_WITH_WHITESPACE})
 ### 2) Define your target(s): just the core library here
 ######################################################################################
 
-SET(RMC_MPI_LIB_OUTPUT_PATH ${PEO_DIR}/build)
+SET(RMC_MPI_LIB_OUTPUT_PATH ${ParadisEO-PEO_BINARY_DIR}/lib)
 SET(LIBRARY_OUTPUT_PATH ${RMC_MPI_LIB_OUTPUT_PATH})
 
 SET (RMC_MPI_SOURCES node.cpp