diff --git a/NPDocumentation/CATS_det.png b/Documentation/CATS_det.png
similarity index 100%
rename from NPDocumentation/CATS_det.png
rename to Documentation/CATS_det.png
diff --git a/NPDocumentation/Cats.tex b/Documentation/Cats.tex
similarity index 100%
rename from NPDocumentation/Cats.tex
rename to Documentation/Cats.tex
diff --git a/NPDocumentation/FullParis.eps b/Documentation/FullParis.eps
similarity index 100%
rename from NPDocumentation/FullParis.eps
rename to Documentation/FullParis.eps
diff --git a/NPDocumentation/FullParisNoShield.eps b/Documentation/FullParisNoShield.eps
similarity index 100%
rename from NPDocumentation/FullParisNoShield.eps
rename to Documentation/FullParisNoShield.eps
diff --git a/NPDocumentation/Gaspard.tex b/Documentation/Gaspard.tex
similarity index 100%
rename from NPDocumentation/Gaspard.tex
rename to Documentation/Gaspard.tex
diff --git a/NPDocumentation/Hyde.tex b/Documentation/Hyde.tex
similarity index 100%
rename from NPDocumentation/Hyde.tex
rename to Documentation/Hyde.tex
diff --git a/NPDocumentation/NPTool_UserGuide.tex b/Documentation/NPTool_UserGuide.tex
similarity index 100%
rename from NPDocumentation/NPTool_UserGuide.tex
rename to Documentation/NPTool_UserGuide.tex
diff --git a/NPDocumentation/Paris.tex b/Documentation/Paris.tex
similarity index 100%
rename from NPDocumentation/Paris.tex
rename to Documentation/Paris.tex
diff --git a/NPDocumentation/Paris3by3.eps b/Documentation/Paris3by3.eps
similarity index 100%
rename from NPDocumentation/Paris3by3.eps
rename to Documentation/Paris3by3.eps
diff --git a/NPDocumentation/Parismodule1.eps b/Documentation/Parismodule1.eps
similarity index 100%
rename from NPDocumentation/Parismodule1.eps
rename to Documentation/Parismodule1.eps
diff --git a/NPDocumentation/pictures/nptool_scheme_Ana.png b/Documentation/pictures/nptool_scheme_Ana.png
similarity index 100%
rename from NPDocumentation/pictures/nptool_scheme_Ana.png
rename to Documentation/pictures/nptool_scheme_Ana.png
diff --git a/NPDocumentation/pictures/nptool_scheme_Sim.png b/Documentation/pictures/nptool_scheme_Sim.png
similarity index 100%
rename from NPDocumentation/pictures/nptool_scheme_Sim.png
rename to Documentation/pictures/nptool_scheme_Sim.png
diff --git a/NPTutorials/.gitignore b/Examples/.gitignore
similarity index 100%
rename from NPTutorials/.gitignore
rename to Examples/.gitignore
diff --git a/NPTutorials/cats/Analysis.cxx b/Examples/cats/Analysis.cxx
similarity index 100%
rename from NPTutorials/cats/Analysis.cxx
rename to Examples/cats/Analysis.cxx
diff --git a/NPTutorials/cats/Analysis.h b/Examples/cats/Analysis.h
similarity index 100%
rename from NPTutorials/cats/Analysis.h
rename to Examples/cats/Analysis.h
diff --git a/NPTutorials/cats/Calibration/CATS_Calib_D1_X.txt b/Examples/cats/Calibration/CATS_Calib_D1_X.txt
similarity index 100%
rename from NPTutorials/cats/Calibration/CATS_Calib_D1_X.txt
rename to Examples/cats/Calibration/CATS_Calib_D1_X.txt
diff --git a/NPTutorials/cats/Calibration/CATS_Calib_D1_Y.txt b/Examples/cats/Calibration/CATS_Calib_D1_Y.txt
similarity index 100%
rename from NPTutorials/cats/Calibration/CATS_Calib_D1_Y.txt
rename to Examples/cats/Calibration/CATS_Calib_D1_Y.txt
diff --git a/NPTutorials/cats/Calibration/CATS_Calib_D2_X.txt b/Examples/cats/Calibration/CATS_Calib_D2_X.txt
similarity index 100%
rename from NPTutorials/cats/Calibration/CATS_Calib_D2_X.txt
rename to Examples/cats/Calibration/CATS_Calib_D2_X.txt
diff --git a/NPTutorials/cats/Calibration/CATS_Calib_D2_Y.txt b/Examples/cats/Calibration/CATS_Calib_D2_Y.txt
similarity index 100%
rename from NPTutorials/cats/Calibration/CATS_Calib_D2_Y.txt
rename to Examples/cats/Calibration/CATS_Calib_D2_Y.txt
diff --git a/NPTutorials/cats/Makefile b/Examples/cats/Makefile
similarity index 100%
rename from NPTutorials/cats/Makefile
rename to Examples/cats/Makefile
diff --git a/NPTutorials/cats/README.txt b/Examples/cats/README.txt
similarity index 100%
rename from NPTutorials/cats/README.txt
rename to Examples/cats/README.txt
diff --git a/NPTutorials/cats/RunToTreat.txt b/Examples/cats/RunToTreat.txt
similarity index 100%
rename from NPTutorials/cats/RunToTreat.txt
rename to Examples/cats/RunToTreat.txt
diff --git a/NPTutorials/cats/ShowResult.C b/Examples/cats/ShowResult.C
similarity index 100%
rename from NPTutorials/cats/ShowResult.C
rename to Examples/cats/ShowResult.C
diff --git a/NPTutorials/cats/calibration.txt b/Examples/cats/calibration.txt
similarity index 100%
rename from NPTutorials/cats/calibration.txt
rename to Examples/cats/calibration.txt
diff --git a/NPTutorials/cats/configs/.DS_Store b/Examples/cats/configs/.DS_Store
similarity index 100%
rename from NPTutorials/cats/configs/.DS_Store
rename to Examples/cats/configs/.DS_Store
diff --git a/NPTutorials/cats/configs/ConfigCATS.dat b/Examples/cats/configs/ConfigCATS.dat
similarity index 100%
rename from NPTutorials/cats/configs/ConfigCATS.dat
rename to Examples/cats/configs/ConfigCATS.dat
diff --git a/NPTutorials/cats/configs/ConfigMust2.dat b/Examples/cats/configs/ConfigMust2.dat
similarity index 100%
rename from NPTutorials/cats/configs/ConfigMust2.dat
rename to Examples/cats/configs/ConfigMust2.dat
diff --git a/NPSimulation/GASPARD/GaspardTrackerAnnular.cc b/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
index 3aa1a379091d84aa8f322021fe84d18b22be1672..da76eb36b76eaa204a3077c4fa69ac2d4cdb7aa5 100644
--- a/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
@@ -854,6 +854,7 @@ void GaspardTrackerAnnular::InitializeScorers()
    // First stage scorer
    G4VPrimitiveScorer* GPDScorerFirstStage =
       new SILICONSCORERS::PS_Silicon_Annular("GPDAnnularFirstStage",
+                                             0,
                                              FirstStageRmin,
                                              FirstStageRmax,
                                              0*deg,
@@ -865,6 +866,7 @@ void GaspardTrackerAnnular::InitializeScorers()
    // Second stage scorer
    G4VPrimitiveScorer* GPDScorerSecondStage =
       new SILICONSCORERS::PS_Silicon_Annular("GPDAnnularSecondStage",
+                                             0,
                                              FirstStageRmin,
                                              FirstStageRmax,
                                              0*deg,
@@ -876,6 +878,7 @@ void GaspardTrackerAnnular::InitializeScorers()
    // Third stage scorer
    G4VPrimitiveScorer* GPDScorerThirdStage =
       new SILICONSCORERS::PS_Silicon_Annular("GPDAnnularThirdStage",
+                                             0,
                                              FirstStageRmin,
                                              FirstStageRmax,
                                              0*deg,
diff --git a/NPSimulation/GASPARD/GaspardTrackerSquare.cc b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
index a5469fb6b1d476ab741fa8e9dee0b800b040e02a..011527d92d27789f0685508326509a6a53ac3ced 100644
--- a/NPSimulation/GASPARD/GaspardTrackerSquare.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
@@ -750,6 +750,7 @@ void GaspardTrackerSquare::InitializeScorers()
    // First stage scorer
    G4VPrimitiveScorer* GPDScorerFirstStage =
       new SILICONSCORERS::PS_Silicon_Rectangle("GPDSquareFirstStage",
+                                               0,
                                                FirstStageFace,
                                                FirstStageFace,
                                                NumberOfStrips,
@@ -758,6 +759,7 @@ void GaspardTrackerSquare::InitializeScorers()
    // Second stage scorer
    G4VPrimitiveScorer* GPDScorerSecondStage =
       new SILICONSCORERS::PS_Silicon_Rectangle("GPDSquareSecondStage",
+                                               0,
                                                SecondStageFace,
                                                SecondStageFace,
                                                1,
@@ -766,6 +768,7 @@ void GaspardTrackerSquare::InitializeScorers()
    // Third stage scorer
    G4VPrimitiveScorer* GPDScorerThirdStage =
       new SILICONSCORERS::PS_Silicon_Rectangle("GPDSquareThirdStage",
+                                               0,
                                                ThirdStageFace,
                                                ThirdStageFace,
                                                1,