diff --git a/ForwardDetectors/AFP/AFP_GeoModel/CMakeLists.txt b/ForwardDetectors/AFP/AFP_GeoModel/CMakeLists.txt
index 4fb6aad378174a30b8a65d67a4309aabb0a3d55f..d69c92a3e11618be8e5f787fbf3703419e4e5b3e 100644
--- a/ForwardDetectors/AFP/AFP_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_GeoModel/CMakeLists.txt
@@ -1,21 +1,16 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AFP_GeoModel )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
-atlas_add_library( AFP_GeoModelLib
-                   src/*.cxx
-                   PUBLIC_HEADERS AFP_GeoModel
-                   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
-                   PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AFP_Geometry AthenaKernel GeoModelUtilities
-                   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaPoolUtilities GaudiKernel GeoModelInterfaces GeoPrimitives StoreGateLib )
-
 atlas_add_component( AFP_GeoModel
+		     src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AFP_GeoModelLib )
+		     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
+		     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} AFP_Geometry AthenaKernel GeoModelUtilities AthenaPoolUtilities GaudiKernel GeoModelInterfaces GeoPrimitives StoreGateLib )
+
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelFactory.h b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelFactory.h
index 71108d94991424972ac5d9bf035a83f0951b1183..162645f457c89a8a806743cbae588699d550f84e 100755
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelFactory.h
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelFactory.h
@@ -6,7 +6,7 @@
 #define AFP_GeoModelFactory_h 1
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "AFP_GeoModel/AFP_GeoModelManager.h"
+#include "AFP_GeoModelManager.h"
 #include "AFP_Geometry/AFP_Geometry.h"
 #include <string>
 #include <map>
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelHP.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelHP.cxx
index c14f19eeec92798da2925efcd461c7054fb31458..102f44a75942b014bd16b047642d60b5b66eeda3 100644
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelHP.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelHP.cxx
@@ -24,8 +24,6 @@
 #include "CLHEP/GenericFunctions/Sin.hh"
 #include "CLHEP/GenericFunctions/Cos.hh"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
-
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
 #include <iostream>
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelManager.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelManager.cxx
index a6dc6b0fce9bb4264988afefaf30942e8b914a8d..94935a3e6bb7499f73849a5d3e664ad63f33185c 100755
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelManager.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelManager.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "AFP_GeoModel/AFP_GeoModelManager.h"
+#include "AFP_GeoModelManager.h"
 AFP_GeoModelManager::AFP_GeoModelManager()
 {
 	setName(std::string("AFP_GeoModel"));
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/AFP_GeoModel/AFP_GeoModelManager.h b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelManager.h
similarity index 100%
rename from ForwardDetectors/AFP/AFP_GeoModel/AFP_GeoModel/AFP_GeoModelManager.h
rename to ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelManager.h
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelRP.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelRP.cxx
index e531e03b94f3fbdb273941fad80cf2e8aa8c2f3b..9da67d0fcd2a65bcc80ed3339c9c790988cc3126 100644
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelRP.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelRP.cxx
@@ -24,7 +24,6 @@
 #include "CLHEP/GenericFunctions/Sin.hh"
 #include "CLHEP/GenericFunctions/Cos.hh"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
 #include <iostream>
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelSID.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelSID.cxx
index 624092cf6dac48f886de69b1c5cd2c27a45cfa53..863ff17c9a7a5e241503b2c05560c472cf707750 100644
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelSID.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelSID.cxx
@@ -23,7 +23,6 @@
 #include "CLHEP/GenericFunctions/Sin.hh"
 #include "CLHEP/GenericFunctions/Cos.hh"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
 #include <iostream>
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTD.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTD.cxx
index f3bb94f04e39925f23f455b79b744f2b2d96377a..6662f644fce64245fda3650937a2f836a96be07e 100644
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTD.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTD.cxx
@@ -27,7 +27,6 @@
 
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelUtilities/GeoOpticalPhysVol.h"
 #include "GeoModelUtilities/GeoOpticalSurface.h"
 #include "GeoModelUtilities/GeoBorderSurfaceContainer.h"
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTool.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTool.cxx
index 98f4b6270d9eed238c43e9ce7990acd91542cc94..33bda4b5559beaf6f2a3a4a06754c88c139a8908 100755
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTool.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/AFP_GeoModelTool.cxx
@@ -12,7 +12,7 @@
 
 #include "AFP_GeoModelTool.h"
 #include "AFP_GeoModelFactory.h"
-#include "AFP_GeoModel/AFP_GeoModelManager.h"
+#include "AFP_GeoModelManager.h"
 
 /**
  ** Constructor(s)
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
index 66ccfefbf02ce74604da598ed535c43e5bb03f1c..95e3c2596ac4806fd3e52d402e5fd44d546d6484 100644
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
@@ -1,17 +1,17 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ALFA_GeoModel )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_component( ALFA_GeoModel
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel AthenaPoolUtilities GeoModelInterfaces GeoModelUtilities ALFA_Geometry StoreGateLib GaudiKernel RDBAccessSvcLib GeoPrimitives )
+                     INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel AthenaPoolUtilities GeoModelInterfaces GeoModelUtilities ALFA_Geometry StoreGateLib GaudiKernel RDBAccessSvcLib GeoPrimitives )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/CMakeLists.txt b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/CMakeLists.txt
index 3bca878bddb221954e6dbe1d7c2e65b6cd5129f4..93bd0e57d481456529f62871eeb794d124651f74 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/CMakeLists.txt
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/CMakeLists.txt
@@ -1,24 +1,24 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ForwardRegionGeoModel )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_library( ForwardRegionGeoModelLib
-                   src/*.cxx
+		   ForwardRegionGeoModel/*.h
+		   INTERFACE
                    PUBLIC_HEADERS ForwardRegionGeoModel
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                   DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GaudiKernel GeoModelUtilities
-                   PRIVATE_LINK_LIBRARIES GeoModelInterfaces PathResolver StoreGateLib )
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel )
 
 atlas_add_component( ForwardRegionGeoModel
+                     src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES ForwardRegionGeoModelLib )
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} ForwardRegionGeoModelLib AthenaKernel  GeoModelUtilities GeoModelInterfaces PathResolver StoreGateLib )
 
 # Install files from the package:
 atlas_install_runtime( share/*.csv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.h b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.h
index c4a8eb6d6837e56abc4c45604a047808fa316987..fa5c2703761fc963a7ea8697faf84a03581d6422 100755
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.h
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.h
@@ -5,7 +5,7 @@
 #ifndef ForwardRegionGeoModelFactory_h
 #define ForwardRegionGeoModelFactory_h 1
 #include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "ForwardRegionGeoModel/ForwardRegionGeoModelManager.h"
+#include "ForwardRegionGeoModelManager.h"
 
 #include "ForwardRegionGeoModel/IForwardRegionProperties.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.cxx
index 0b3943d22d68515aac9fade2c565979ecc14306f..d11edd04f717a4e8bd7c1611edd1df38801de10c 100755
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "ForwardRegionGeoModel/ForwardRegionGeoModelManager.h"
+#include "ForwardRegionGeoModelManager.h"
 ForwardRegionGeoModelManager::ForwardRegionGeoModelManager()
 {
   setName("ForwardRegionGeoModel");
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/ForwardRegionGeoModel/ForwardRegionGeoModelManager.h b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.h
similarity index 100%
rename from ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/ForwardRegionGeoModel/ForwardRegionGeoModelManager.h
rename to ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.h
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx
index 3817b0114a79f43b848a612600ef322b58d0422d..5d496f31370cbfa6968be5e9e7720687795f73ec 100755
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx
@@ -4,7 +4,7 @@
 
 #include "ForwardRegionGeoModelTool.h"
 #include "ForwardRegionGeoModelFactory.h"
-#include "ForwardRegionGeoModel/ForwardRegionGeoModelManager.h"
+#include "ForwardRegionGeoModelManager.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
index 5130e81fa0de096df5c31a152b2c3d96ae331759..5431171225420ba1dca8d74801ecea6084ce81d6 100644
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
@@ -1,17 +1,17 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( LUCID_GeoModel )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_library( LUCID_GeoModelLib
                    src/*.cxx
                    PUBLIC_HEADERS LUCID_GeoModel
-                   INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
+                   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GeoModelUtilities
                    PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
 
 atlas_add_component( LUCID_GeoModel
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/CMakeLists.txt b/ForwardDetectors/ZDC/ZDC_GeoM/CMakeLists.txt
index ec25f9553b2e429f2d5536125875c0db823726fa..37ca1c24a8b7eb893d5c5a8dbac8882627f2020e 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/CMakeLists.txt
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/CMakeLists.txt
@@ -1,18 +1,13 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ZDC_GeoM )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
-atlas_add_library( ZDC_GeoMLib
-                   src/*.cxx
-                   PUBLIC_HEADERS ZDC_GeoM
-                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
-                   PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces StoreGateLib )
-
 atlas_add_component( ZDC_GeoM
+		     src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES ZDC_GeoMLib )
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel GeoModelInterfaces StoreGateLib )
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.h b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.h
index 32cb0d6d86a13b87e7e778c6d1b83c20cb5f5005..3ba91bcc6a1eef5bb365e225c000cfd4d8a0f0b0 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.h
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.h
@@ -6,7 +6,7 @@
 #define ZDC_DETFACTORY_H
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "ZDC_GeoM/ZDC_DetManager.h"
+#include "ZDC_DetManager.h"
 #include "AthenaKernel/MsgStreamMember.h"
 
 class StoreGateSvc;
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx
index f6f66222a2945458a74db47d906236860fbd453a..b55c2f96262bed061e786c6e96f4ad826e447d4f 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "ZDC_GeoM/ZDC_DetManager.h"
+#include "ZDC_DetManager.h"
 
 ZDC_DetManager::ZDC_DetManager()
 {
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/ZDC_GeoM/ZDC_DetManager.h b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.h
similarity index 100%
rename from ForwardDetectors/ZDC/ZDC_GeoM/ZDC_GeoM/ZDC_DetManager.h
rename to ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.h
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetTool.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetTool.cxx
index 91de16b137ca2dee8051cce1ad98c1384c29cf21..e2268aaa3d7322c70df9a4352e28f354731ac4d9 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetTool.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetTool.cxx
@@ -4,7 +4,7 @@
 
 #include "ZDC_DetTool.h"
 #include "ZDC_DetFactory.h" 
-#include "ZDC_GeoM/ZDC_DetManager.h" 
+#include "ZDC_DetManager.h" 
 #include "GeoModelUtilities/GeoModelExperiment.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"