diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 70b5df7..3a2f3ea 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,44 +1,44 @@
 SET( test_name "test_CLIC_o2_v04_sim" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "$ENV{lcgeo_DIR}/bin/run_test_lcgeo.sh"
-  ddsim --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml --runType=batch -G -N=100 --outputFile=testCLIC_o2_v04.slcio --gun.isotrop=true --steeringFile=${CMAKE_SOURCE_DIR}/examples/clic_steer.py
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS o2_v04
+  COMMAND "run_test_lcgeo.sh"
+  ddsim --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml --runType=batch -G -N=100 --outputFile=testCLIC_o2_v04.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/clic_steer.py
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS o2_v04
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" )
 
 SET( test_name "test_CLIC_o2_v04_reco_truth" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml
   --global.LCIOInputFiles=testCLIC_o2_v04.slcio clicReconstruction_o2.xml
   --Config.Tracking=Truth
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_truth_rec.slcio
   --Output_DST.LCIOOutputFile=reco_truth_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS o2_v04
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS o2_v04
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
 
 SET( test_name "test_CLIC_o2_v04_reco_conformal" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml
   --global.LCIOInputFiles=testCLIC_o2_v04.slcio clicReconstruction_o2.xml
   --Config.Tracking=Conformal
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_conformal_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS o2_v04
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS o2_v04
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
 SET( test_name "test_CLIC_o2_v04_reco_overlay" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml
   --global.LCIOInputFiles=testCLIC_o2_v04.slcio clicReconstruction_o2.xml
   --Config.Overlay=3TeV
@@ -46,7 +46,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_overlay_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS o2_v04
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS o2_v04
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
@@ -54,7 +54,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Except
 SET( test_name "test_CLIC_o2_v04_reco_conformal_overlay_valgrind" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --leak-check=full
   --show-leak-kinds=all
@@ -67,7 +67,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=10
   --Output_REC.LCIOOutputFile=reco_overlay_conform_valgrind_v04_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_conform_valgrind_v04_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS o2_v04
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS o2_v04
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
@@ -77,50 +77,50 @@ SET(EOS_BACKGROUND_FILE /eos/experiment/clicdp/grid/ilc/prod/clic/3tev/gghad/CLI
 SET(CLIC_DETECTOR_MODEL CLIC_o3_v14)
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_sim" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "$ENV{lcgeo_DIR}/bin/run_test_lcgeo.sh"
+  COMMAND "run_test_lcgeo.sh"
   ddsim
   --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --runType=batch -G -N=100
   --outputFile=test${CLIC_DETECTOR_MODEL}.slcio
   --gun.isotrop=true
-  --steeringFile=${CMAKE_SOURCE_DIR}/examples/clic_steer.py
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/clic_steer.py
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" )
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_truth" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
   --Config.Tracking=Truth
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_truth_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_truth_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
   --Config.Tracking=Conformal
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_overlay" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
   --Config.Tracking=Truth
@@ -129,15 +129,15 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_overlay_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_real_overlay" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
   --Config.Tracking=Truth
@@ -146,7 +146,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_overlay_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   CONFIGURATIONS EOS
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
@@ -158,12 +158,12 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_overlay_valgrind" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --leak-check=full
   --show-leak-kinds=all
   --suppressions=${ROOT_DIR}/../etc/valgrind-root.supp
-  --suppressions=${CMAKE_SOURCE_DIR}/etc/extra-root.supp
+  --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../etc/extra-root.supp
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
@@ -173,19 +173,19 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_overlay_valgrind_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_valgrind_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_valgrind" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --leak-check=full
   --show-leak-kinds=all
   --suppressions=${ROOT_DIR}/../etc/valgrind-root.supp
-  --suppressions=${CMAKE_SOURCE_DIR}/etc/extra-root.supp
+  --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../etc/extra-root.supp
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
@@ -193,7 +193,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_conformal_valgrind_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_valgrind_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error"
   TIMEOUT 300000
@@ -203,12 +203,12 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Except
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_overlay_valgrind" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --leak-check=full
   --show-leak-kinds=all
   --suppressions=${ROOT_DIR}/../etc/valgrind-root.supp
-  --suppressions=${CMAKE_SOURCE_DIR}/etc/extra-root.supp
+  --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../etc/extra-root.supp
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}.slcio clicReconstruction.xml
@@ -218,7 +218,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_overlay_conformal_valgrind_${CLIC_DETECTOR_MODEL}_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_conformal_valgrind_${CLIC_DETECTOR_MODEL}_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error"
   TIMEOUT 300000
@@ -227,14 +227,14 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Except
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_sim_zuds" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "$ENV{lcgeo_DIR}/bin/run_test_lcgeo.sh"
+  COMMAND "run_test_lcgeo.sh"
   ddsim
   --compactFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --runType=batch -N=4
   --outputFile=test${CLIC_DETECTOR_MODEL}_zuds.slcio
   --inputFiles /eos/experiment/clicdp/grid/ilc/user/w/webermat/stdhep/Zuds3000/Zuds3000__01.stdhep
-  --steeringFile=${CMAKE_SOURCE_DIR}/examples/clic_steer.py
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/clic_steer.py
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   CONFIGURATIONS EOS
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
@@ -245,15 +245,15 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_zuds" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}_zuds.slcio clicReconstruction.xml
   --Config.Tracking=Conformal
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_zuds_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_zuds_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   CONFIGURATIONS EOS
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
@@ -264,8 +264,8 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_zuds_overlay" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}_zuds.slcio clicReconstruction.xml
   --Config.Tracking=Conformal
@@ -274,7 +274,7 @@ ADD_TEST( NAME t_${test_name}
   --Overlay3TeV.BackgroundFileNames=${EOS_BACKGROUND_FILE}
   --Output_REC.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_zuds_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_zuds_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   CONFIGURATIONS EOS
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
@@ -289,12 +289,12 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_zuds_valgrind" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --leak-check=full
   --show-leak-kinds=all
   --suppressions=${ROOT_DIR}/../etc/valgrind-root.supp
-  --suppressions=${CMAKE_SOURCE_DIR}/etc/extra-root.supp
+  --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../etc/extra-root.supp
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}_zuds.slcio clicReconstruction.xml
@@ -302,7 +302,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_conformal_valgrind_${CLIC_DETECTOR_MODEL}_zuds_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_valgrind_${CLIC_DETECTOR_MODEL}_zuds_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
   FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error"
@@ -313,12 +313,12 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_overlay_zuds_valgrind" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --leak-check=full
   --show-leak-kinds=all
   --suppressions=${ROOT_DIR}/../etc/valgrind-root.supp
-  --suppressions=${CMAKE_SOURCE_DIR}/etc/extra-root.supp
+  --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../etc/extra-root.supp
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${CLIC_DETECTOR_MODEL}_zuds.slcio clicReconstruction.xml
@@ -328,7 +328,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_overlay_conformal_valgrind_${CLIC_DETECTOR_MODEL}_zuds_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_conformal_valgrind_${CLIC_DETECTOR_MODEL}_zuds_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
   FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error"
@@ -342,7 +342,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_zuds_massif" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --tool=massif
   Marlin
@@ -352,7 +352,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_conformal_msassif_${CLIC_DETECTOR_MODEL}_zuds_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_msassif_${CLIC_DETECTOR_MODEL}_zuds_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
   FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error"
@@ -364,7 +364,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_overlay_zuds_massif" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/ValgrindTests.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so ${VALGRIND_LIB}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/ValgrindTests.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so ${VALGRIND_LIB}
   ${VALGRIND}
   --tool=massif
   Marlin
@@ -376,7 +376,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=4
   --Output_REC.LCIOOutputFile=reco_overlay_conformal_${CLIC_DETECTOR_MODEL}_zuds_rec.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_conformal_${CLIC_DETECTOR_MODEL}_zuds_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/ CONFIGURATIONS valgrind
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/ CONFIGURATIONS valgrind
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
   FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error"
@@ -389,7 +389,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_zuds_profile" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/Profiler.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/Profiler.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so
   amplxe-cl -collect hotspots -r ../ClicReco/r@@@{at}
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
@@ -398,7 +398,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=10
   --Output_REC.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_zuds_rec_prof.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_${CLIC_DETECTOR_MODEL}_zuds_dst_prof.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   CONFIGURATIONS PROF
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
@@ -411,7 +411,7 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET( test_name "test_${CLIC_DETECTOR_MODEL}_reco_conformal_zuds_overlay_profile" )
 ADD_TEST( NAME t_${test_name}
   COMMAND
-  ${CMAKE_SOURCE_DIR}/Tests/bin/Profiler.sh ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/Profiler.sh ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so
   amplxe-cl -collect hotspots -r ../ClicReco/r@@@{at}_over
   Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/CLIC/compact/${CLIC_DETECTOR_MODEL}/${CLIC_DETECTOR_MODEL}.xml
@@ -422,7 +422,7 @@ ADD_TEST( NAME t_${test_name}
   --global.MaxRecordNumber=1
   --Output_REC.LCIOOutputFile=reco_overlay_conformal_${CLIC_DETECTOR_MODEL}_zuds_rec_over_prof.slcio
   --Output_DST.LCIOOutputFile=reco_overlay_conformal_${CLIC_DETECTOR_MODEL}_zuds_dst_over_prof.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../clicConfig/
   CONFIGURATIONS PROF
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
@@ -435,36 +435,36 @@ SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES
 SET(FCCee_DETECTOR_MODEL FCCee_o1_v02)
 SET( test_name "test_${FCCee_DETECTOR_MODEL}_sim" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND "$ENV{lcgeo_DIR}/bin/run_test_lcgeo.sh"
-  ddsim --compactFile=$ENV{lcgeo_DIR}/FCCee/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml --runType=batch -G -N=100 --outputFile=test${FCCee_DETECTOR_MODEL}.slcio --gun.isotrop=true --steeringFile=${CMAKE_SOURCE_DIR}/examples/fcc_steer.py
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  COMMAND "run_test_lcgeo.sh"
+  ddsim --compactFile=$ENV{lcgeo_DIR}/FCCee/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml --runType=batch -G -N=100 --outputFile=test${FCCee_DETECTOR_MODEL}.slcio --gun.isotrop=true --steeringFile=${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/fcc_steer.py
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" )
  
 SET( test_name "test_${FCCee_DETECTOR_MODEL}_reco_truth" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/FCCee/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${FCCee_DETECTOR_MODEL}.slcio fccReconstruction.xml
   --Config.Tracking=Truth
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_truth_rec.slcio
   --Output_DST.LCIOOutputFile=reco_truth_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
  
 SET( test_name "test_${FCCee_DETECTOR_MODEL}_reco_conformal" )
 ADD_TEST( NAME t_${test_name}
-  COMMAND ${CMAKE_SOURCE_DIR}/Tests/bin/MarlinTests.sh
-  ${CMAKE_SOURCE_DIR}/lib/libClicPerformance.so  Marlin
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../Tests/bin/MarlinTests.sh
+  ${CMAKE_INSTALL_PREFIX}/lib/libClicPerformance.so  Marlin
   --InitDD4hep.DD4hepXMLFile=$ENV{lcgeo_DIR}/FCCee/compact/${FCCee_DETECTOR_MODEL}/${FCCee_DETECTOR_MODEL}.xml
   --global.LCIOInputFiles=test${FCCee_DETECTOR_MODEL}.slcio fccReconstruction.xml
   --Config.Tracking=Conformal
   --global.MaxRecordNumber=3
   --Output_REC.LCIOOutputFile=reco_conformal_rec.slcio
   --Output_DST.LCIOOutputFile=reco_conformal_dst.slcio
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/examples/
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../fcceeConfig/
   )
 SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;\\[ ERROR;Error" )
diff --git a/examples/BeamCal_BackgroundPars_380GeV.root b/clicConfig/BeamCal_BackgroundPars_380GeV.root
similarity index 100%
rename from examples/BeamCal_BackgroundPars_380GeV.root
rename to clicConfig/BeamCal_BackgroundPars_380GeV.root
diff --git a/examples/BeamCal_BackgroundPars_3TeV.root b/clicConfig/BeamCal_BackgroundPars_3TeV.root
similarity index 100%
rename from examples/BeamCal_BackgroundPars_3TeV.root
rename to clicConfig/BeamCal_BackgroundPars_3TeV.root
diff --git a/examples/PandoraSettings/PandoraLikelihoodData12EBin.xml b/clicConfig/PandoraSettings/PandoraLikelihoodData12EBin.xml
similarity index 100%
rename from examples/PandoraSettings/PandoraLikelihoodData12EBin.xml
rename to clicConfig/PandoraSettings/PandoraLikelihoodData12EBin.xml
diff --git a/examples/PandoraSettings/PandoraLikelihoodData9EBin.xml b/clicConfig/PandoraSettings/PandoraLikelihoodData9EBin.xml
similarity index 100%
rename from examples/PandoraSettings/PandoraLikelihoodData9EBin.xml
rename to clicConfig/PandoraSettings/PandoraLikelihoodData9EBin.xml
diff --git a/examples/PandoraSettings/PandoraSettingsDefault.xml b/clicConfig/PandoraSettings/PandoraSettingsDefault.xml
similarity index 100%
rename from examples/PandoraSettings/PandoraSettingsDefault.xml
rename to clicConfig/PandoraSettings/PandoraSettingsDefault.xml
diff --git a/examples/clicReconstruction.xml b/clicConfig/clicReconstruction.xml
similarity index 100%
rename from examples/clicReconstruction.xml
rename to clicConfig/clicReconstruction.xml
diff --git a/examples/clic_steer.py b/clicConfig/clic_steer.py
similarity index 100%
rename from examples/clic_steer.py
rename to clicConfig/clic_steer.py
diff --git a/examples/PandoraSettingsFCCee/PandoraLikelihoodData9EBin.xml b/fcceeConfig/PandoraSettingsFCCee/PandoraLikelihoodData9EBin.xml
similarity index 100%
rename from examples/PandoraSettingsFCCee/PandoraLikelihoodData9EBin.xml
rename to fcceeConfig/PandoraSettingsFCCee/PandoraLikelihoodData9EBin.xml
diff --git a/examples/PandoraSettingsFCCee/PandoraSettingsDefault.xml b/fcceeConfig/PandoraSettingsFCCee/PandoraSettingsDefault.xml
similarity index 100%
rename from examples/PandoraSettingsFCCee/PandoraSettingsDefault.xml
rename to fcceeConfig/PandoraSettingsFCCee/PandoraSettingsDefault.xml
diff --git a/examples/fccReconstruction.xml b/fcceeConfig/fccReconstruction.xml
similarity index 100%
rename from examples/fccReconstruction.xml
rename to fcceeConfig/fccReconstruction.xml
diff --git a/examples/fcc_steer.py b/fcceeConfig/fcc_steer.py
similarity index 100%
rename from examples/fcc_steer.py
rename to fcceeConfig/fcc_steer.py