diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44a9fca4..16f96a2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,18 +23,17 @@ SET(CXX_DISABLE_WERROR true)
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/idl.cmake)
 INCLUDE(cmake/python.cmake)
+INCLUDE(cmake/hpp.cmake)
 
-SET(PROJECT_ORG humanoid-path-planner)
 SET(PROJECT_NAME hpp-rbprm-corba)
 SET(PROJECT_DESCRIPTION "Corba server for reachability based planning")
-SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
 
 # Set to 1 for profiling
 #add_definitions(-DPROFILE)
 
 SET(CUSTOM_HEADER_DIR hpp/corbaserver/rbprm)
 
-SETUP_PROJECT ()
+SETUP_HPP_PROJECT ()
 
 SET(${PROJECT_NAME}_HEADERS
   include/hpp/corbaserver/rbprm/server.hh
@@ -53,7 +52,7 @@ ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
 ADD_REQUIRED_DEPENDENCY("hpp-affordance-corba")
 ADD_REQUIRED_DEPENDENCY("hpp-util >= 3")
 
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake2")
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/CDD")
 find_package(CDD REQUIRED)
 
 add_required_dependency("octomap >= 1.8")
@@ -77,4 +76,4 @@ ADD_SUBDIRECTORY(src)
 
 CONFIG_FILES (include/hpp/corbaserver/rbprm/doc.hh)
 
-SETUP_PROJECT_FINALIZE()
+SETUP_HPP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index 320c6369..5c8c19f4 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 320c636960b03b3bad7c7a08bd2e104951f42bc3
+Subproject commit 5c8c19f491f2c6f8488f5f37ff81d711d69dbb3f
diff --git a/cmake2/FindCDD.cmake b/cmake2/FindCDD.cmake
deleted file mode 100644
index a861a5e6..00000000
--- a/cmake2/FindCDD.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# - Try to find libcdd
-# Once done this will define
-#  CDD_FOUND - System has CDD
-#  CDD_INCLUDE_DIRS - The CDD include directories
-#  CDD_LIBRARIES - The libraries needed to use CDD
-#  CDD_DEFINITIONS - Compiler switches required for using CDD
-
-
-find_path(CDD_INCLUDE_DIR cdd.h
-          HINTS ${CDD_INCLUDEDIR} /usr/include /usr/include/cdd /usr/include/cddlib
-          PATH_SUFFIXES CDD )
-
-find_library(CDD_LIBRARY NAMES libcdd.so
-             HINTS ${CDD_LIBDIR} ${CDD_LIBRARY_DIRS} /usr/lib/libcdd.so )
-
-set(CDD_LIBRARIES ${CDD_LIBRARY} )
-set(CDD_INCLUDE_DIRS ${CDD_INCLUDE_DIR} )
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set CDD_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(CDD  DEFAULT_MSG
-                                  CDD_LIBRARY CDD_INCLUDE_DIR)
-
-mark_as_advanced(CDD_INCLUDE_DIR CDD_LIBRARY )