diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1aa76595f15f214db4b9d1b5248f2ee9cd34980..52ab283b565c94129d3e2192dad3693a5818be04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
 
 project(DD4hep)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) 
+set(CMAKE_MODULE_PATH      ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) 
+set(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 #---Options-------------------------------------------------------------------------
 option(DD4HEP_USE_XERCESC "Enable 'Detector Builders' based on XercesC" OFF)
@@ -20,6 +22,9 @@ enable_testing()
 #---Documentation-------------------------------------------------------------------
 include(DD4hepDoxygen)
 
+#---DD4hep internal functions-------------------------------------------------------
+include(DD4hep)
+
 #---Packages------------------------------------------------------------------------
 add_subdirectory(DDCore)
 if(DD4HEP_WITH_GEANT4)
@@ -27,18 +32,17 @@ if(DD4HEP_WITH_GEANT4)
 endif()
 
 #---Examples------------------------------------------------------------------------
+add_subdirectory(DDExamples/UtilityApps)
 add_subdirectory(DDExamples/AlignDet)
 add_subdirectory(DDExamples/CLICSiD)
-add_subdirectory(DDExamples/CLICSiDDisplay)
 add_subdirectory(DDExamples/ILDExDet)
-add_subdirectory(DDExamples/ILDExDisplay)
 add_subdirectory(DDExamples/ILDExReco)
 add_subdirectory(DDExamples/ILDExTest)
 if(DD4HEP_WITH_GEANT4)
-  add_subdirectory(DDExamples/CLICSiDSimu)
-  add_subdirectory(DDExamples/ILDExSimu)
+   add_subdirectory(DDExamples/CLICSiDSimu)
+#  add_subdirectory(DDExamples/ILDExSimu)
 endif()
 
 #---Configuration-------------------------------------------------------------------
 configure_file(cmake/thisdd4hep.csh thisdd4hep.csh @ONLY)
-configure_file(cmake/thisdd4hep.sh thisdd4hep.sh @ONLY)
+configure_file(cmake/thisdd4hep.sh  thisdd4hep.sh @ONLY)