diff --git a/GeoModelExamples/GeoActions/CMakeLists.txt b/GeoModelExamples/GeoActions/CMakeLists.txt
index d50bdfe22cc0d3152272c53ba6e0f07571a1d5e3..7f0efb2795bac78051a08242beaf3100158a9f10 100644
--- a/GeoModelExamples/GeoActions/CMakeLists.txt
+++ b/GeoModelExamples/GeoActions/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(GeoActions)
+#project(GeoActions)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
@@ -15,8 +15,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED  ) 
+  find_package( GeoModelIO REQUIRED ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt b/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
index f1894f8dbe3406d313bfa69d7ebe6dec26af2e7b..0dafa939e9258fd32cca4c51cb61aa647ddde5ba 100644
--- a/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
+++ b/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(GeoFullPhysVolEx)
+#project(GeoFullPhysVolEx)
 
 
 # Compile with C++17
@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED  )
+  find_package( GeoModelIO REQUIRED  )
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/GeoShapeExamples/CMakeLists.txt b/GeoModelExamples/GeoShapeExamples/CMakeLists.txt
index f9bf3915c4c25ca31b9b0487377f0f7ebb2ee526..5fc886f4830c311cbbdc5cc290ecd3927562eecd 100644
--- a/GeoModelExamples/GeoShapeExamples/CMakeLists.txt
+++ b/GeoModelExamples/GeoShapeExamples/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(GeoShapeExamples)
+#project(GeoShapeExamples)
 
 
 # Compile with C++17
@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED ) 
+  find_package( GeoModelIO REQUIRED ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/GeoShiftUnion/CMakeLists.txt b/GeoModelExamples/GeoShiftUnion/CMakeLists.txt
index c8ca4731fc7280fa9fe262c555663c1e0d8649e2..4d16de5fae91cb92dd96b6d64a24238f8ddb0dd8 100644
--- a/GeoModelExamples/GeoShiftUnion/CMakeLists.txt
+++ b/GeoModelExamples/GeoShiftUnion/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(GeoShiftUnion)
+#project(GeoShiftUnion)
 
 
 # Compile with C++17
@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED  ) 
+  find_package( GeoModelIO REQUIRED ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt b/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
index d26058a52742689bb9149b6a35ed40f9ef94d46b..82c2df633ee7a82ae4fc26abcc937198b62627af 100644
--- a/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
+++ b/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(GeoTessellatedSolidExample)
+#project(GeoTessellatedSolidExample)
 
 
 # Compile with C++17
@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED ) 
+  find_package( GeoModelIO REQUIRED) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt b/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
index 534de900942a604b4203107fb593e55a33c370ce..69c45abbfe09532e60ee858a02fb1c273b8c82cd 100644
--- a/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
+++ b/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(HelloDummyMaterial)
+#project(HelloDummyMaterial)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED ) 
+  find_package( GeoModelIO REQUIRED ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/HelloGeo/CMakeLists.txt b/GeoModelExamples/HelloGeo/CMakeLists.txt
index dc419131b237bd039537d1b05e71aea919d33ca6..a7964d597ea9c82bb4ad4323ad6d99c3097025ea 100644
--- a/GeoModelExamples/HelloGeo/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeo/CMakeLists.txt
@@ -12,11 +12,14 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
-project(HelloGeo)
+#project(HelloGeo)
 
 # Find the needed dependencies, when building individually
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
+  message (${CMAKE_SOURCE_DIR}) 
+  message (${PROJECT_SOURCE_DIR})
+  
+if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
+   find_package( GeoModelCore REQUIRED  ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/HelloGeoRead/CMakeLists.txt b/GeoModelExamples/HelloGeoRead/CMakeLists.txt
index 52c5bdd6c55e5fe0a3590669ed59a7bb5c4599b4..59f098de3ae233c4a5885fce0502e24580ff5269 100644
--- a/GeoModelExamples/HelloGeoRead/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoRead/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(HelloGeoRead)
+#project(HelloGeoRead)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED ) 
+  find_package( GeoModelIO REQUIRED )
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt b/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
index 1a75b73d4858a4262b8588c645f7be3e76204a7d..be563d9b336cbcf6dbf6fa71e54da44aa1682e9d 100644
--- a/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
@@ -7,15 +7,15 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(HelloGeoRead2G4)
+#project(HelloGeoRead2G4)
 
 # Find includes in current dir
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED  )
+  find_package( GeoModelIO REQUIRED ) 
 endif()
 
 ## External dependencies.
diff --git a/GeoModelExamples/HelloGeoWrite/CMakeLists.txt b/GeoModelExamples/HelloGeoWrite/CMakeLists.txt
index 6e0e7bacd9dedb38687aaf31814b443b39b9ac30..498d3b3f24b9b2a55438a772f0778a323bc63dfb 100644
--- a/GeoModelExamples/HelloGeoWrite/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoWrite/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(HelloGeoWrite)
+#project(HelloGeoWrite)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
@@ -15,8 +15,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED ) 
+  find_package( GeoModelIO REQUIRED ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/HelloToy/CMakeLists.txt b/GeoModelExamples/HelloToy/CMakeLists.txt
index 0a5f31cdfa73b00e37cca04ab328b01bc2c499f8..aff08b4673a1b7f88ed8ad8b26abf41d983f763b 100644
--- a/GeoModelExamples/HelloToy/CMakeLists.txt
+++ b/GeoModelExamples/HelloToy/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(HelloToy)
+#project(HelloToy)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED  ) 
+  find_package( GeoModelIO REQUIRED  ) 
 endif()
 
 # Find includes in current dir
diff --git a/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt b/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
index b6c04bfb2b9fdca99eb5ceb06992e8be4e98089a..2d4aa975f779baddede0aa9b8659daf7bb3bf9c0 100644
--- a/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
+++ b/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(HelloToyDetectorFactory)
+#project(HelloToyDetectorFactory)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
 
 # Find the needed dependencies, when building individually
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 
-  find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder
-  find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder 
+  find_package( GeoModelCore REQUIRED  ) 
+  find_package( GeoModelIO REQUIRED  ) 
 endif()
 
 # Find includes in current dir