diff --git a/SimG4Core/Application/src/RunManager.cc b/SimG4Core/Application/src/RunManager.cc
index d42ca3b40b6ef..c927b35732463 100644
--- a/SimG4Core/Application/src/RunManager.cc
+++ b/SimG4Core/Application/src/RunManager.cc
@@ -14,7 +14,7 @@
#include "SimG4Core/Geometry/interface/DDDWorld.h"
#include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"
#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
-#include "SimG4Core/Physics/interface/DDG4ProductionCuts.h"
+#include "SimG4Core/Geometry/interface/DDG4ProductionCuts.h"
#include "SimG4Core/SensitiveDetector/interface/AttachSD.h"
diff --git a/SimG4Core/Application/src/RunManagerMT.cc b/SimG4Core/Application/src/RunManagerMT.cc
index 4a6f9b4577b1f..a629e77d95431 100644
--- a/SimG4Core/Application/src/RunManagerMT.cc
+++ b/SimG4Core/Application/src/RunManagerMT.cc
@@ -8,7 +8,7 @@
#include "SimG4Core/Geometry/interface/DDDWorld.h"
#include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"
-#include "SimG4Core/Physics/interface/DDG4ProductionCuts.h"
+#include "SimG4Core/Geometry/interface/DDG4ProductionCuts.h"
#include "SimG4Core/SensitiveDetector/interface/AttachSD.h"
diff --git a/SimG4Core/CustomPhysics/BuildFile.xml b/SimG4Core/CustomPhysics/BuildFile.xml
index fd83c90f846b1..797e555a670b1 100644
--- a/SimG4Core/CustomPhysics/BuildFile.xml
+++ b/SimG4Core/CustomPhysics/BuildFile.xml
@@ -9,3 +9,4 @@
+
diff --git a/SimG4Core/Physics/interface/DDG4ProductionCuts.h b/SimG4Core/Geometry/interface/DDG4ProductionCuts.h
similarity index 100%
rename from SimG4Core/Physics/interface/DDG4ProductionCuts.h
rename to SimG4Core/Geometry/interface/DDG4ProductionCuts.h
diff --git a/SimG4Core/Physics/src/DDG4ProductionCuts.cc b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc
similarity index 98%
rename from SimG4Core/Physics/src/DDG4ProductionCuts.cc
rename to SimG4Core/Geometry/src/DDG4ProductionCuts.cc
index 30247dd655b9a..02a242f688cd1 100644
--- a/SimG4Core/Physics/src/DDG4ProductionCuts.cc
+++ b/SimG4Core/Geometry/src/DDG4ProductionCuts.cc
@@ -1,4 +1,4 @@
-#include "SimG4Core/Physics/interface/DDG4ProductionCuts.h"
+#include "SimG4Core/Geometry/interface/DDG4ProductionCuts.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/Utilities/interface/Exception.h"
diff --git a/SimG4Core/Physics/BuildFile.xml b/SimG4Core/Physics/BuildFile.xml
index 3dacd5ca6fb25..faf1f058c671f 100644
--- a/SimG4Core/Physics/BuildFile.xml
+++ b/SimG4Core/Physics/BuildFile.xml
@@ -1,7 +1,6 @@
-