diff --git a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
index 47bc90e70e3918c68763f4512d5a8933db3af85e..7e5a002f6523367648d3352e0c54c79af861a311 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
@@ -16,3 +16,6 @@ add_custom_target( geomDB ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/geomDB_sqlite
 # Install the generated file:
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/geomDB_sqlite
          DESTINATION ${CMAKE_INSTALL_DATADIR} )
+
+# Install python files from the package:
+atlas_install_python_modules( python/*.py )
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py
new file mode 100644
index 0000000000000000000000000000000000000000..fd8bdd276ff83b1fca75c3f4723f8be01d4abf95
--- /dev/null
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+## @file: AtlasGeoModel/python/GeoModelInit.py
+## @brief: Encapsulate GeoModel configuration
+ 
+def _setupGeoModel():
+    from AthenaCommon.JobProperties import jobproperties
+    from AthenaCommon.AppMgr import theApp
+    from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ 
+    import DetDescrCnvSvc.DetStoreConfig
+    svcMgr.DetDescrCnvSvc.IdDictFromRDB = True
+
+    # Conditions DB setup and TagInfo
+    from IOVDbSvc.CondDB import conddb
+    import EventInfoMgt.EventInfoMgtInit
+ 
+    from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+    svcMgr += GeoModelSvc()
+    theApp.CreateSvc += [ "GeoModelSvc"]
+
+    # Set up detector tools here
+
+    pass
+
+## setup GeoModel at module import
+_setupGeoModel()
+
+## clean-up: avoid running multiple times this method
+del _setupGeoModel
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py b/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py
new file mode 100644
index 0000000000000000000000000000000000000000..aeb522cc7bc9893780216b701607718a17786bf0
--- /dev/null
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.JobProperties import jobproperties
+#from AthenaCommon.DetFlags    import DetFlags
+
+DDversion    = jobproperties.Global.DetDescrVersion()
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+from DetDescrCnvSvc.DetDescrCnvSvcConf import DetDescrCnvSvc
+
+GeoModelSvc = GeoModelSvc()
+DetDescrCnvSvc = DetDescrCnvSvc()
+
+GeoModelSvc.FaserVersion = DDversion
+
+# Set the SupportedGeometry flag
+from AthenaCommon.AppMgr import release_metadata
+rel_metadata = release_metadata()
+relversion = rel_metadata['release'].split('.')
+if len(relversion) < 3:
+    relversion = rel_metadata['base release'].split('.')
+
+print "SetGeometryVersion.py obtained major release version %s" % relversion[0]
+GeoModelSvc.SupportedGeometry = int(relversion[0])
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/__init__.py b/DetectorDescription/GeoModel/FaserGeoModel/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..c3ff304a0f5154f1256f8f043d4efacdde547cde
--- /dev/null
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/__init__.py
@@ -0,0 +1 @@
+#  __author__ = 'Dave Casper'
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/share/geoDebug.py b/DetectorDescription/GeoModel/GeoModelSvc/share/geoDebug.py
index 73bdcab7cd98c0cc3345ab865ee71fea5c7e9744..fc263220df9ef442ba7ee5c773fe839405802272 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/share/geoDebug.py
+++ b/DetectorDescription/GeoModel/GeoModelSvc/share/geoDebug.py
@@ -15,36 +15,14 @@ globalflags.DetDescrVersion.set_Value_and_Lock( "FASER-00" )
 #DetFlags.detdescr.SCT_setOn()
 
 #include('ISF_Config/AllDet_detDescr.py')
-# from SetGeometryVersion
-from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
-from DetDescrCnvSvc.DetDescrCnvSvcConf import DetDescrCnvSvc
-
-GeoModelSvc = GeoModelSvc()
-DetDescrCnvSvc = DetDescrCnvSvc()
 
-GeoModelSvc.FaserVersion = "FASER-00"
+from FaserGeoModel import SetGeometryVersion
+from FaserGeoModel import GeoModelInit
 
-from AthenaCommon.AppMgr import release_metadata
-rel_metadata = release_metadata()
-relversion = rel_metadata['release'].split('.')
-if len(relversion) < 3:
-    relversion = rel_metadata['base release'].split('.')
-
-print "SetGeometryVersion.py obtained major release version %s" % relversion[0]
-GeoModelSvc.SupportedGeometry = int(relversion[0])
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
 GeoModelSvc.PrintMaterials = True
 
-# from GeoModelInit
-
-import DetDescrCnvSvc.DetStoreConfig
-svcMgr.DetDescrCnvSvc.IdDictFromRDB = True
-import EventInfoMgt.EventInfoMgtInit
-
-# from GeoModelInitStandard
-
-ServiceMgr += GeoModelSvc
-theApp.CreateSvc += [ "GeoModelSvc"]
-
 #DetFlags.Print()
 
 from AthenaCommon.AppMgr import theApp