diff --git a/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h b/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h
deleted file mode 100644
index 1ac319ebb449a..0000000000000
--- a/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef SimG4Core_PrintGeomInfoAction_H
-#define SimG4Core_PrintGeomInfoAction_H
-
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "G4NavigationHistory.hh"
-
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-
-class BeginOfJob;
-class BeginOfRun;
-class G4LogicalVolume;
-class G4VPhysicalVolume;
-class G4VSolid;
-
-typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
-
-class PrintGeomInfoAction : public SimWatcher, public Observer<const BeginOfJob*>, public Observer<const BeginOfRun*> {
-public:
-  PrintGeomInfoAction(edm::ParameterSet const& p);
-  ~PrintGeomInfoAction() override;
-
-private:
-  void update(const BeginOfJob* job) override;
-  void update(const BeginOfRun* run) override;
-  void dumpSummary(std::ostream& out = std::cout);
-  void dumpG4LVList(std::ostream& out = std::cout);
-  void dumpG4LVTree(std::ostream& out = std::cout);
-  void dumpMaterialList(std::ostream& out = std::cout);
-  void dumpG4LVLeaf(G4LogicalVolume* lv, unsigned int leafDepth, unsigned int count, std::ostream& out = std::cout);
-  int countNoTouchables();
-  void add1touchable(G4LogicalVolume* lv, int& nTouch);
-  void dumpHierarchyTreePVLV(std::ostream& out = std::cout);
-  void dumpHierarchyLeafPVLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpPV(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpSolid(G4VSolid* sol, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
-  void dumpInFile();
-  void getTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, unsigned int copym, std::vector<std::string>& touches);
-  std::string spacesFromLeafDepth(unsigned int leafDepth);
-  G4VPhysicalVolume* getTopPV();
-  G4LogicalVolume* getTopLV();
-
-private:
-  bool dumpSummary_, dumpLVTree_, dumpLVList_, dumpMaterial_;
-  bool dumpLV_, dumpSolid_, dumpAtts_, dumpPV_;
-  bool dumpRotation_, dumpReplica_, dumpTouch_;
-  bool dumpSense_, dd4hep_;
-  std::string name_;
-  int nchar_;
-  std::string fileMat_, fileSolid_, fileLV_, filePV_, fileTouch_;
-  bool fileDetail_;
-  std::vector<std::string> names_;
-  G4VPhysicalVolume* theTopPV_;
-  G4NavigationHistory fHistory_;
-};
-
-#endif
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h b/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h
deleted file mode 100644
index b90715e98b867..0000000000000
--- a/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef SimG4Core_PrintGeomSummary_H
-#define SimG4Core_PrintGeomSummary_H
-
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "DetectorDescription/Core/interface/DDSolidShapes.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "G4NavigationHistory.hh"
-
-#include <algorithm>
-#include <iostream>
-#include <vector>
-#include <map>
-#include <string>
-
-class BeginOfJob;
-class BeginOfRun;
-class DDLogicalPart;
-class G4LogicalVolume;
-class G4VPhysicalVolume;
-class G4VSolid;
-
-class PrintGeomSummary : public SimWatcher, public Observer<const BeginOfJob *>, public Observer<const BeginOfRun *> {
-public:
-  PrintGeomSummary(edm::ParameterSet const &p);
-  ~PrintGeomSummary() override;
-
-private:
-  void update(const BeginOfJob *job) override;
-  void update(const BeginOfRun *run) override;
-  void addSolid(const DDLogicalPart &part);
-  void fillLV(G4LogicalVolume *lv);
-  void fillPV(G4VPhysicalVolume *pv);
-  void dumpSummary(std::ostream &out, std::string name);
-  G4VPhysicalVolume *getTopPV();
-  void addName(std::string name);
-  void printSummary(std::ostream &out);
-
-private:
-  std::vector<std::string> nodeNames_;
-  std::map<DDSolidShape, std::string> solidShape_;
-  std::map<std::string, DDSolidShape> solidMap_;
-  G4VPhysicalVolume *theTopPV_;
-  std::vector<G4LogicalVolume *> lvs_, touch_;
-  std::vector<G4VSolid *> sls_;
-  std::vector<G4VPhysicalVolume *> pvs_;
-  std::map<DDSolidShape, std::pair<int, int> > kount_;
-};
-
-#endif
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h b/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h
deleted file mode 100644
index b6f15711ebe22..0000000000000
--- a/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef SimG4CorePrintGeomInfo_PrintMaterialBudgetInfo_H
-#define SimG4CorePrintGeomInfo_PrintMaterialBudgetInfo_H
-
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "G4NavigationHistory.hh"
-
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-
-class BeginOfJob;
-class BeginOfRun;
-class G4LogicalVolume;
-class G4VPhysicalVolume;
-class G4VSolid;
-
-typedef std::map<G4VPhysicalVolume*, G4VPhysicalVolume*, std::less<G4VPhysicalVolume*> > mpvpv;
-typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
-
-class PrintMaterialBudgetInfo : public SimWatcher,
-                                public Observer<const BeginOfJob*>,
-                                public Observer<const BeginOfRun*> {
-public:
-  PrintMaterialBudgetInfo(edm::ParameterSet const& p);
-  ~PrintMaterialBudgetInfo() override;
-
-private:
-  void update(const BeginOfJob* job) override{};
-  void update(const BeginOfRun* run) override;
-  void dumpHeader(std::ostream& out = std::cout);
-  void dumpLaTeXHeader(std::ostream& out = std::cout);
-  void dumpHierarchyLeaf(G4VPhysicalVolume* pv,
-                         G4LogicalVolume* lv,
-                         unsigned int leafDepth,
-                         std::ostream& weightOut = std::cout,
-                         std::ostream& texOut = std::cout);
-  void printInfo(G4VPhysicalVolume* pv,
-                 G4LogicalVolume* lv,
-                 unsigned int leafDepth,
-                 std::ostream& weightOut = std::cout,
-                 std::ostream& texOut = std::cout);
-  void dumpElementMassFraction(std::ostream& elementOut = std::cout);
-  void dumpLaTeXFooter(std::ostream& out = std::cout);
-
-private:
-  std::string name;
-  int nchar;
-  mpvpv thePVTree;
-  G4VPhysicalVolume* theTopPV;
-  G4NavigationHistory fHistory;
-  bool volumeFound;
-  unsigned int levelFound;
-  std::ofstream weightOutputFile;
-  std::ofstream elementOutputFile;
-  std::ofstream texOutputFile;
-  std::vector<std::string> elementNames;
-  std::vector<double> elementTotalWeight;
-  std::vector<double> elementWeightFraction;
-  //
-  std::string stringLaTeXUnderscore(std::string stringname);
-  std::string stringLaTeXSuperscript(std::string stringname);
-};
-
-#endif
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h b/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h
deleted file mode 100644
index b1350c12a63fe..0000000000000
--- a/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef SimG4Core_PrintSensitive_H
-#define SimG4Core_PrintSensitive_H
-
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "G4NavigationHistory.hh"
-
-#include <iostream>
-#include <string>
-
-class BeginOfRun;
-class G4VPhysicalVolume;
-
-class PrintSensitive : public SimWatcher, public Observer<const BeginOfRun *> {
-public:
-  PrintSensitive(edm::ParameterSet const &p);
-  ~PrintSensitive() override;
-
-private:
-  void update(const BeginOfRun *run) override;
-  int dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, bool printIt, int ns, std::ostream &out = std::cout);
-  G4VPhysicalVolume *getTopPV();
-
-private:
-  std::string name_;
-  int nchar_;
-  G4NavigationHistory fHistory;
-};
-
-#endif
diff --git a/SimG4Core/PrintGeomInfo/BuildFile.xml b/SimG4Core/PrintGeomInfo/plugins/BuildFile.xml
similarity index 74%
rename from SimG4Core/PrintGeomInfo/BuildFile.xml
rename to SimG4Core/PrintGeomInfo/plugins/BuildFile.xml
index 653a8b3bee5f9..ea42c90fd14df 100644
--- a/SimG4Core/PrintGeomInfo/BuildFile.xml
+++ b/SimG4Core/PrintGeomInfo/plugins/BuildFile.xml
@@ -1,4 +1,3 @@
-<flags EDM_PLUGIN="1"/>
 <use name="DetectorDescription/Core"/>
 <use name="DetectorDescription/DDCMS"/>
 <use name="SimG4Core/Notification"/>
@@ -8,3 +7,6 @@
 <use name="geant4core"/>
 <use name="dd4hep"/>
 <use name="boost"/>
+<library file="*.cc" name="SimG4CorePrintGeomInfoPlugins">
+  <flags EDM_PLUGIN="1"/>
+</library>
diff --git a/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc
similarity index 90%
rename from SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc
rename to SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc
index f428d816dc131..2585069ba46aa 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc
+++ b/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc
@@ -1,10 +1,11 @@
-#include "SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h"
-
 #include "SimG4Core/Notification/interface/BeginOfJob.h"
 #include "SimG4Core/Notification/interface/BeginOfRun.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Math/interface/angle_units.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
@@ -19,26 +20,71 @@
 #include "DD4hep/DD4hepUnits.h"
 #include "DD4hep/Filter.h"
 
-#include "G4Run.hh"
-#include "G4PhysicalVolumeStore.hh"
 #include "G4LogicalVolumeStore.hh"
-#include "G4VPhysicalVolume.hh"
 #include "G4LogicalVolume.hh"
 #include "G4VSolid.hh"
 #include "G4Material.hh"
+#include "G4NavigationHistory.hh"
+#include "G4PhysicalVolumeStore.hh"
+#include "G4Run.hh"
 #include "G4Track.hh"
-#include "G4VisAttributes.hh"
-#include "G4UserLimits.hh"
 #include "G4TransportationManager.hh"
+#include "G4UserLimits.hh"
+#include "G4VisAttributes.hh"
+#include "G4VPhysicalVolume.hh"
 
 #include <algorithm>
 #include <fstream>
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
 using angle_units::operators::convertRadToDeg;
 
+typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
+
+class PrintGeomInfoAction : public SimWatcher, public Observer<const BeginOfJob*>, public Observer<const BeginOfRun*> {
+public:
+  PrintGeomInfoAction(edm::ParameterSet const& p);
+  ~PrintGeomInfoAction() override;
+
+private:
+  void update(const BeginOfJob* job) override;
+  void update(const BeginOfRun* run) override;
+  void dumpSummary(std::ostream& out = std::cout);
+  void dumpG4LVList(std::ostream& out = std::cout);
+  void dumpG4LVTree(std::ostream& out = std::cout);
+  void dumpMaterialList(std::ostream& out = std::cout);
+  void dumpG4LVLeaf(G4LogicalVolume* lv, unsigned int leafDepth, unsigned int count, std::ostream& out = std::cout);
+  int countNoTouchables();
+  void add1touchable(G4LogicalVolume* lv, int& nTouch);
+  void dumpHierarchyTreePVLV(std::ostream& out = std::cout);
+  void dumpHierarchyLeafPVLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpPV(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpSolid(G4VSolid* sol, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpInFile();
+  void getTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, unsigned int copym, std::vector<std::string>& touches);
+  std::string spacesFromLeafDepth(unsigned int leafDepth);
+  G4VPhysicalVolume* getTopPV();
+  G4LogicalVolume* getTopLV();
+
+private:
+  bool dumpSummary_, dumpLVTree_, dumpLVList_, dumpMaterial_;
+  bool dumpLV_, dumpSolid_, dumpAtts_, dumpPV_;
+  bool dumpRotation_, dumpReplica_, dumpTouch_;
+  bool dumpSense_, dd4hep_;
+  std::string name_;
+  int nchar_;
+  std::string fileMat_, fileSolid_, fileLV_, filePV_, fileTouch_;
+  bool fileDetail_;
+  std::vector<std::string> names_;
+  G4VPhysicalVolume* theTopPV_;
+  G4NavigationHistory fHistory_;
+};
+
 PrintGeomInfoAction::PrintGeomInfoAction(const edm::ParameterSet &p) {
   dumpSummary_ = p.getUntrackedParameter<bool>("DumpSummary", true);
   dumpLVTree_ = p.getUntrackedParameter<bool>("DumpLVTree", true);
@@ -538,3 +584,8 @@ G4VPhysicalVolume *PrintGeomInfoAction::getTopPV() {
 }
 
 G4LogicalVolume *PrintGeomInfoAction::getTopLV() { return theTopPV_->GetLogicalVolume(); }
+
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+DEFINE_SIMWATCHER(PrintGeomInfoAction);
diff --git a/SimG4Core/PrintGeomInfo/src/PrintGeomSolids.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomSolids.cc
similarity index 100%
rename from SimG4Core/PrintGeomInfo/src/PrintGeomSolids.cc
rename to SimG4Core/PrintGeomInfo/plugins/PrintGeomSolids.cc
diff --git a/SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomSummary.cc
similarity index 85%
rename from SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc
rename to SimG4Core/PrintGeomInfo/plugins/PrintGeomSummary.cc
index d33113318dcf0..346899e7718fe 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc
+++ b/SimG4Core/PrintGeomInfo/plugins/PrintGeomSummary.cc
@@ -1,16 +1,18 @@
-#include "SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h"
-
 #include "SimG4Core/Notification/interface/BeginOfJob.h"
 #include "SimG4Core/Notification/interface/BeginOfRun.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
+#include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
 #include "DetectorDescription/Core/interface/DDValue.h"
 
@@ -21,13 +23,45 @@
 #include "G4LogicalVolume.hh"
 #include "G4VSolid.hh"
 #include "G4Material.hh"
+#include "G4NavigationHistory.hh"
 #include "G4Track.hh"
 #include "G4VisAttributes.hh"
 #include "G4UserLimits.hh"
 #include "G4TransportationManager.hh"
 
-#include <set>
+#include <algorithm>
+#include <iostream>
+#include <vector>
 #include <map>
+#include <set>
+#include <string>
+
+class PrintGeomSummary : public SimWatcher, public Observer<const BeginOfJob *>, public Observer<const BeginOfRun *> {
+public:
+  PrintGeomSummary(edm::ParameterSet const &p);
+  ~PrintGeomSummary() override;
+
+private:
+  void update(const BeginOfJob *job) override;
+  void update(const BeginOfRun *run) override;
+  void addSolid(const DDLogicalPart &part);
+  void fillLV(G4LogicalVolume *lv);
+  void fillPV(G4VPhysicalVolume *pv);
+  void dumpSummary(std::ostream &out, std::string name);
+  G4VPhysicalVolume *getTopPV();
+  void addName(std::string name);
+  void printSummary(std::ostream &out);
+
+private:
+  std::vector<std::string> nodeNames_;
+  std::map<DDSolidShape, std::string> solidShape_;
+  std::map<std::string, DDSolidShape> solidMap_;
+  G4VPhysicalVolume *theTopPV_;
+  std::vector<G4LogicalVolume *> lvs_, touch_;
+  std::vector<G4VSolid *> sls_;
+  std::vector<G4VPhysicalVolume *> pvs_;
+  std::map<DDSolidShape, std::pair<int, int> > kount_;
+};
 
 PrintGeomSummary::PrintGeomSummary(const edm::ParameterSet& p) : theTopPV_(nullptr) {
   std::vector<std::string> defNames;
@@ -215,3 +249,8 @@ void PrintGeomSummary::printSummary(std::ostream& out) {
     out << "Shape [" << k << "]  " << shape << " # " << (itr->second).first << " : " << (itr->second).second << G4endl;
   }
 }
+
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+DEFINE_SIMWATCHER(PrintGeomSummary);
diff --git a/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc b/SimG4Core/PrintGeomInfo/plugins/PrintMaterialBudgetInfo.cc
similarity index 82%
rename from SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc
rename to SimG4Core/PrintGeomInfo/plugins/PrintMaterialBudgetInfo.cc
index e5eed4192dcd8..56e02d6de72b2 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc
+++ b/SimG4Core/PrintGeomInfo/plugins/PrintMaterialBudgetInfo.cc
@@ -1,10 +1,11 @@
-#include "SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h"
-
 #include "SimG4Core/Notification/interface/BeginOfJob.h"
 #include "SimG4Core/Notification/interface/BeginOfRun.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
@@ -20,6 +21,7 @@
 #include "G4LogicalVolume.hh"
 #include "G4VSolid.hh"
 #include "G4Material.hh"
+#include "G4NavigationHistory.hh"
 #include "G4Track.hh"
 #include "G4VisAttributes.hh"
 #include "G4UserLimits.hh"
@@ -27,7 +29,58 @@
 #include "G4UnitsTable.hh"
 #include "Randomize.hh"
 
+#include <iostream>
+#include <fstream>
 #include <set>
+#include <vector>
+#include <string>
+
+typedef std::map<G4VPhysicalVolume*, G4VPhysicalVolume*, std::less<G4VPhysicalVolume*> > mpvpv;
+typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
+
+class PrintMaterialBudgetInfo : public SimWatcher,
+                                public Observer<const BeginOfJob*>,
+                                public Observer<const BeginOfRun*> {
+public:
+  PrintMaterialBudgetInfo(edm::ParameterSet const& p);
+  ~PrintMaterialBudgetInfo() override;
+
+private:
+  void update(const BeginOfJob* job) override{};
+  void update(const BeginOfRun* run) override;
+  void dumpHeader(std::ostream& out = std::cout);
+  void dumpLaTeXHeader(std::ostream& out = std::cout);
+  void dumpHierarchyLeaf(G4VPhysicalVolume* pv,
+                         G4LogicalVolume* lv,
+                         unsigned int leafDepth,
+                         std::ostream& weightOut = std::cout,
+                         std::ostream& texOut = std::cout);
+  void printInfo(G4VPhysicalVolume* pv,
+                 G4LogicalVolume* lv,
+                 unsigned int leafDepth,
+                 std::ostream& weightOut = std::cout,
+                 std::ostream& texOut = std::cout);
+  void dumpElementMassFraction(std::ostream& elementOut = std::cout);
+  void dumpLaTeXFooter(std::ostream& out = std::cout);
+
+private:
+  std::string name;
+  int nchar;
+  mpvpv thePVTree;
+  G4VPhysicalVolume* theTopPV;
+  G4NavigationHistory fHistory;
+  bool volumeFound;
+  unsigned int levelFound;
+  std::ofstream weightOutputFile;
+  std::ofstream elementOutputFile;
+  std::ofstream texOutputFile;
+  std::vector<std::string> elementNames;
+  std::vector<double> elementTotalWeight;
+  std::vector<double> elementWeightFraction;
+  //
+  std::string stringLaTeXUnderscore(std::string stringname);
+  std::string stringLaTeXSuperscript(std::string stringname);
+};
 
 PrintMaterialBudgetInfo::PrintMaterialBudgetInfo(const edm::ParameterSet& p) {
   name = p.getUntrackedParameter<std::string>("Name", "*");
@@ -303,3 +356,8 @@ std::string PrintMaterialBudgetInfo::stringLaTeXSuperscript(std::string stringna
 
   return stringoutput;
 }
+
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+DEFINE_SIMWATCHER(PrintMaterialBudgetInfo);
diff --git a/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc b/SimG4Core/PrintGeomInfo/plugins/PrintSensitive.cc
similarity index 73%
rename from SimG4Core/PrintGeomInfo/src/PrintSensitive.cc
rename to SimG4Core/PrintGeomInfo/plugins/PrintSensitive.cc
index 9d1cdb2f12482..5a0d74bd5454b 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc
+++ b/SimG4Core/PrintGeomInfo/plugins/PrintSensitive.cc
@@ -1,14 +1,34 @@
-#include "SimG4Core/PrintGeomInfo/interface/PrintSensitive.h"
-
 #include "SimG4Core/Notification/interface/BeginOfRun.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "G4Run.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4LogicalVolume.hh"
+#include "G4NavigationHistory.hh"
 #include "G4TransportationManager.hh"
 
 #include <set>
 #include <map>
+#include <iostream>
+#include <string>
+
+class PrintSensitive : public SimWatcher, public Observer<const BeginOfRun *> {
+public:
+  PrintSensitive(edm::ParameterSet const &p);
+  ~PrintSensitive() override;
+
+private:
+  void update(const BeginOfRun *run) override;
+  int dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, bool printIt, int ns, std::ostream &out = std::cout);
+  G4VPhysicalVolume *getTopPV();
+
+private:
+  std::string name_;
+  int nchar_;
+  G4NavigationHistory fHistory;
+};
 
 PrintSensitive::PrintSensitive(const edm::ParameterSet &p) {
   name_ = p.getUntrackedParameter<std::string>("Name", "*");
@@ -66,3 +86,8 @@ int PrintSensitive::dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, boo
 G4VPhysicalVolume *PrintSensitive::getTopPV() {
   return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
 }
+
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+DEFINE_SIMWATCHER(PrintSensitive);
diff --git a/SimG4Core/PrintGeomInfo/src/module.cc b/SimG4Core/PrintGeomInfo/src/module.cc
deleted file mode 100644
index efc9bab12520f..0000000000000
--- a/SimG4Core/PrintGeomInfo/src/module.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h"
-#include "SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h"
-#include "SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h"
-#include "SimG4Core/PrintGeomInfo/interface/PrintSensitive.h"
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-
-DEFINE_SIMWATCHER(PrintGeomInfoAction);
-DEFINE_SIMWATCHER(PrintGeomSummary);
-DEFINE_SIMWATCHER(PrintMaterialBudgetInfo);
-DEFINE_SIMWATCHER(PrintSensitive);