diff --git a/Validation/EcalDigis/BuildFile.xml b/Validation/EcalDigis/plugins/BuildFile.xml
similarity index 100%
rename from Validation/EcalDigis/BuildFile.xml
rename to Validation/EcalDigis/plugins/BuildFile.xml
diff --git a/Validation/EcalDigis/plugins/CollHandle.cpp b/Validation/EcalDigis/plugins/CollHandle.cpp
new file mode 100644
index 0000000000000..7159e44635070
--- /dev/null
+++ b/Validation/EcalDigis/plugins/CollHandle.cpp
@@ -0,0 +1 @@
+#include "CollHandle.h"
diff --git a/Validation/EcalDigis/src/CollHandle.h b/Validation/EcalDigis/plugins/CollHandle.h
similarity index 100%
rename from Validation/EcalDigis/src/CollHandle.h
rename to Validation/EcalDigis/plugins/CollHandle.h
diff --git a/Validation/EcalDigis/src/EcalBarrelDigisValidation.cc b/Validation/EcalDigis/plugins/EcalBarrelDigisValidation.cc
similarity index 99%
rename from Validation/EcalDigis/src/EcalBarrelDigisValidation.cc
rename to Validation/EcalDigis/plugins/EcalBarrelDigisValidation.cc
index 50a2a3e9e65a2..8f6b4a426937e 100644
--- a/Validation/EcalDigis/src/EcalBarrelDigisValidation.cc
+++ b/Validation/EcalDigis/plugins/EcalBarrelDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
+#include "EcalBarrelDigisValidation.h"
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
diff --git a/Validation/EcalDigis/interface/EcalBarrelDigisValidation.h b/Validation/EcalDigis/plugins/EcalBarrelDigisValidation.h
similarity index 97%
rename from Validation/EcalDigis/interface/EcalBarrelDigisValidation.h
rename to Validation/EcalDigis/plugins/EcalBarrelDigisValidation.h
index e4189daacf201..6c25581a22b4b 100644
--- a/Validation/EcalDigis/interface/EcalBarrelDigisValidation.h
+++ b/Validation/EcalDigis/plugins/EcalBarrelDigisValidation.h
@@ -31,7 +31,6 @@
 #include <map>
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 class EcalBarrelDigisValidation : public DQMEDAnalyzer {
diff --git a/Validation/EcalDigis/src/EcalDigisValidation.cc b/Validation/EcalDigis/plugins/EcalDigisValidation.cc
similarity index 99%
rename from Validation/EcalDigis/src/EcalDigisValidation.cc
rename to Validation/EcalDigis/plugins/EcalDigisValidation.cc
index b686d162cdf43..073f99c432049 100644
--- a/Validation/EcalDigis/src/EcalDigisValidation.cc
+++ b/Validation/EcalDigis/plugins/EcalDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalDigisValidation.h>
+#include "EcalDigisValidation.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include <DataFormats/EcalDetId/interface/ESDetId.h>
diff --git a/Validation/EcalDigis/interface/EcalDigisValidation.h b/Validation/EcalDigis/plugins/EcalDigisValidation.h
similarity index 98%
rename from Validation/EcalDigis/interface/EcalDigisValidation.h
rename to Validation/EcalDigis/plugins/EcalDigisValidation.h
index 66e4cf56b20cd..a5a5b4e109c79 100644
--- a/Validation/EcalDigis/interface/EcalDigisValidation.h
+++ b/Validation/EcalDigis/plugins/EcalDigisValidation.h
@@ -37,7 +37,6 @@
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
-#include <Validation/EcalDigis/interface/EcalDigisValidation.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 #include <iostream>
diff --git a/Validation/EcalDigis/src/EcalEndcapDigisValidation.cc b/Validation/EcalDigis/plugins/EcalEndcapDigisValidation.cc
similarity index 99%
rename from Validation/EcalDigis/src/EcalEndcapDigisValidation.cc
rename to Validation/EcalDigis/plugins/EcalEndcapDigisValidation.cc
index 5559830376041..17884bdf2e688 100644
--- a/Validation/EcalDigis/src/EcalEndcapDigisValidation.cc
+++ b/Validation/EcalDigis/plugins/EcalEndcapDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalEndcapDigisValidation.h>
+#include "EcalEndcapDigisValidation.h"
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 using namespace cms;
diff --git a/Validation/EcalDigis/interface/EcalEndcapDigisValidation.h b/Validation/EcalDigis/plugins/EcalEndcapDigisValidation.h
similarity index 97%
rename from Validation/EcalDigis/interface/EcalEndcapDigisValidation.h
rename to Validation/EcalDigis/plugins/EcalEndcapDigisValidation.h
index 333fa60b5dfc9..e1080fed12560 100644
--- a/Validation/EcalDigis/interface/EcalEndcapDigisValidation.h
+++ b/Validation/EcalDigis/plugins/EcalEndcapDigisValidation.h
@@ -25,7 +25,6 @@
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
-#include <Validation/EcalDigis/interface/EcalEndcapDigisValidation.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 #include <iostream>
diff --git a/Validation/EcalDigis/src/EcalMixingModuleValidation.cc b/Validation/EcalDigis/plugins/EcalMixingModuleValidation.cc
similarity index 99%
rename from Validation/EcalDigis/src/EcalMixingModuleValidation.cc
rename to Validation/EcalDigis/plugins/EcalMixingModuleValidation.cc
index b1b255d48ab22..4581dfb837bfe 100644
--- a/Validation/EcalDigis/src/EcalMixingModuleValidation.cc
+++ b/Validation/EcalDigis/plugins/EcalMixingModuleValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalMixingModuleValidation.h>
+#include "EcalMixingModuleValidation.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include <DataFormats/EcalDetId/interface/ESDetId.h>
diff --git a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h b/Validation/EcalDigis/plugins/EcalMixingModuleValidation.h
similarity index 98%
rename from Validation/EcalDigis/interface/EcalMixingModuleValidation.h
rename to Validation/EcalDigis/plugins/EcalMixingModuleValidation.h
index 2f47e0dbbfaa0..093ce2a4fc4c3 100644
--- a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h
+++ b/Validation/EcalDigis/plugins/EcalMixingModuleValidation.h
@@ -55,7 +55,7 @@
 #include "CondFormats/ESObjects/interface/ESPedestals.h"
 #include "CondFormats/DataRecord/interface/ESPedestalsRcd.h"
 #include "CondFormats/ESObjects/interface/ESIntercalibConstants.h"
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
+#include "EcalBarrelDigisValidation.h"
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 
diff --git a/Validation/EcalDigis/src/EcalPreshowerDigisValidation.cc b/Validation/EcalDigis/plugins/EcalPreshowerDigisValidation.cc
similarity index 97%
rename from Validation/EcalDigis/src/EcalPreshowerDigisValidation.cc
rename to Validation/EcalDigis/plugins/EcalPreshowerDigisValidation.cc
index 322eecc9acc70..9139f1db3a14b 100644
--- a/Validation/EcalDigis/src/EcalPreshowerDigisValidation.cc
+++ b/Validation/EcalDigis/plugins/EcalPreshowerDigisValidation.cc
@@ -5,7 +5,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h>
+#include "EcalPreshowerDigisValidation.h"
 
 EcalPreshowerDigisValidation::EcalPreshowerDigisValidation(const edm::ParameterSet& ps)
     : ESdigiCollectionToken_(consumes<ESDigiCollection>(ps.getParameter<edm::InputTag>("ESdigiCollection"))) {
diff --git a/Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h b/Validation/EcalDigis/plugins/EcalPreshowerDigisValidation.h
similarity index 100%
rename from Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h
rename to Validation/EcalDigis/plugins/EcalPreshowerDigisValidation.h
diff --git a/Validation/EcalDigis/src/EcalPreshowerNoiseDistrib.cc b/Validation/EcalDigis/plugins/EcalPreshowerNoiseDistrib.cc
similarity index 97%
rename from Validation/EcalDigis/src/EcalPreshowerNoiseDistrib.cc
rename to Validation/EcalDigis/plugins/EcalPreshowerNoiseDistrib.cc
index c60c0c2a21847..2b01b7965f7c6 100644
--- a/Validation/EcalDigis/src/EcalPreshowerNoiseDistrib.cc
+++ b/Validation/EcalDigis/plugins/EcalPreshowerNoiseDistrib.cc
@@ -3,7 +3,7 @@
  *
 */
 
-#include <Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h>
+#include "EcalPreshowerNoiseDistrib.h"
 
 EcalPreshowerNoiseDistrib::EcalPreshowerNoiseDistrib(const edm::ParameterSet& ps)
     : ESdigiCollectionToken_(consumes<ESDigiCollection>(ps.getParameter<edm::InputTag>("ESdigiCollection"))) {
diff --git a/Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h b/Validation/EcalDigis/plugins/EcalPreshowerNoiseDistrib.h
similarity index 100%
rename from Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h
rename to Validation/EcalDigis/plugins/EcalPreshowerNoiseDistrib.h
diff --git a/Validation/EcalDigis/src/EcalSRPCompat.h b/Validation/EcalDigis/plugins/EcalSRPCompat.h
similarity index 100%
rename from Validation/EcalDigis/src/EcalSRPCompat.h
rename to Validation/EcalDigis/plugins/EcalSRPCompat.h
diff --git a/Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc b/Validation/EcalDigis/plugins/EcalSelectiveReadoutValidation.cc
similarity index 99%
rename from Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc
rename to Validation/EcalDigis/plugins/EcalSelectiveReadoutValidation.cc
index 2a20282ca1fa1..ea99ee03f7d33 100644
--- a/Validation/EcalDigis/src/EcalSelectiveReadoutValidation.cc
+++ b/Validation/EcalDigis/plugins/EcalSelectiveReadoutValidation.cc
@@ -4,9 +4,9 @@
  *
  */
 
-#include "Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h"
+#include "EcalSelectiveReadoutValidation.h"
 
-#include "Validation/EcalDigis/src/ecalDccMap.h"
+#include "ecalDccMap.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"
diff --git a/Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h b/Validation/EcalDigis/plugins/EcalSelectiveReadoutValidation.h
similarity index 99%
rename from Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h
rename to Validation/EcalDigis/plugins/EcalSelectiveReadoutValidation.h
index d732bf4eaa6e4..223cc4b78c5b2 100644
--- a/Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h
+++ b/Validation/EcalDigis/plugins/EcalSelectiveReadoutValidation.h
@@ -32,7 +32,7 @@
 #include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGPhysicsConstRcd.h"
 
-#include "Validation/EcalDigis/src/CollHandle.h"
+#include "CollHandle.h"
 
 #include <string>
 #include <set>
diff --git a/Validation/EcalDigis/plugins/SealModule.cc b/Validation/EcalDigis/plugins/SealModule.cc
new file mode 100644
index 0000000000000..19ce1aad55160
--- /dev/null
+++ b/Validation/EcalDigis/plugins/SealModule.cc
@@ -0,0 +1,24 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+#include "EcalDigisValidation.h"
+DEFINE_FWK_MODULE(EcalDigisValidation);
+
+#include "EcalBarrelDigisValidation.h"
+DEFINE_FWK_MODULE(EcalBarrelDigisValidation);
+
+#include "EcalEndcapDigisValidation.h"
+DEFINE_FWK_MODULE(EcalEndcapDigisValidation);
+
+#include "EcalPreshowerDigisValidation.h"
+DEFINE_FWK_MODULE(EcalPreshowerDigisValidation);
+
+#include "EcalPreshowerNoiseDistrib.h"
+DEFINE_FWK_MODULE(EcalPreshowerNoiseDistrib);
+
+#include "EcalMixingModuleValidation.h"
+DEFINE_FWK_MODULE(EcalMixingModuleValidation);
+
+#include "EcalSelectiveReadoutValidation.h"
+DEFINE_FWK_MODULE(EcalSelectiveReadoutValidation);
diff --git a/Validation/EcalDigis/src/ecalDccMap.h b/Validation/EcalDigis/plugins/ecalDccMap.h
similarity index 100%
rename from Validation/EcalDigis/src/ecalDccMap.h
rename to Validation/EcalDigis/plugins/ecalDccMap.h
diff --git a/Validation/EcalDigis/src/CollHandle.cpp b/Validation/EcalDigis/src/CollHandle.cpp
deleted file mode 100644
index a3af9f60031fd..0000000000000
--- a/Validation/EcalDigis/src/CollHandle.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "Validation/EcalDigis/src/CollHandle.h"
diff --git a/Validation/EcalDigis/src/SealModule.cc b/Validation/EcalDigis/src/SealModule.cc
deleted file mode 100644
index 44318b52dedd9..0000000000000
--- a/Validation/EcalDigis/src/SealModule.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-
-#include "FWCore/Framework/interface/MakerMacros.h"
-
-#include <Validation/EcalDigis/interface/EcalDigisValidation.h>
-DEFINE_FWK_MODULE(EcalDigisValidation);
-
-#include <Validation/EcalDigis/interface/EcalBarrelDigisValidation.h>
-DEFINE_FWK_MODULE(EcalBarrelDigisValidation);
-
-#include <Validation/EcalDigis/interface/EcalEndcapDigisValidation.h>
-DEFINE_FWK_MODULE(EcalEndcapDigisValidation);
-
-#include <Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h>
-DEFINE_FWK_MODULE(EcalPreshowerDigisValidation);
-
-#include <Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h>
-DEFINE_FWK_MODULE(EcalPreshowerNoiseDistrib);
-
-#include <Validation/EcalDigis/interface/EcalMixingModuleValidation.h>
-DEFINE_FWK_MODULE(EcalMixingModuleValidation);
-
-#include "Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h"
-DEFINE_FWK_MODULE(EcalSelectiveReadoutValidation);