diff --git a/OnlineDB/CSCCondDB/BuildFile.xml b/OnlineDB/CSCCondDB/BuildFile.xml
index ac8f3c473c253..c0fe31e830004 100644
--- a/OnlineDB/CSCCondDB/BuildFile.xml
+++ b/OnlineDB/CSCCondDB/BuildFile.xml
@@ -9,4 +9,6 @@
 <use name="OnlineDB/Oracle"/>
 <lib name="occi"/>
 <lib name="Minuit2"/>
-<flags EDM_PLUGIN="1"/>
+<export>
+  <lib name="1"/>
+</export>
diff --git a/OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h b/OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h
deleted file mode 100644
index e2174ae274f55..0000000000000
--- a/OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// user include files
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-
-#include "FWCore/Framework/interface/Event.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "FWCore/Framework/interface/EventSetup.h"
-
-//
-// class declaration
-//
-
-#include "OnlineDB/CSCCondDB/interface/CSCCableRead.h"
-
-class CSCChamberTimeCorrectionsReadTest : public edm::EDAnalyzer {
-public:
-  explicit CSCChamberTimeCorrectionsReadTest(const edm::ParameterSet&);
-  ~CSCChamberTimeCorrectionsReadTest() override;
-
-private:
-  void beginJob() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override;
-};
diff --git a/OnlineDB/CSCCondDB/interface/CSCMap1Read.h b/OnlineDB/CSCCondDB/interface/CSCMap1Read.h
deleted file mode 100644
index 6ff6351b9e70a..0000000000000
--- a/OnlineDB/CSCCondDB/interface/CSCMap1Read.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// user include files
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-
-#include "FWCore/Framework/interface/Event.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "FWCore/Framework/interface/EventSetup.h"
-
-//
-// class declaration
-//
-
-#include "OnlineDB/CSCCondDB/interface/CSCMap1.h"
-
-class CSCMap1Read : public edm::EDAnalyzer {
-public:
-  explicit CSCMap1Read(const edm::ParameterSet&);
-  ~CSCMap1Read() override;
-
-private:
-  void beginJob() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override;
-};
diff --git a/OnlineDB/CSCCondDB/interface/SaturationFit.h b/OnlineDB/CSCCondDB/interface/SaturationFit.h
deleted file mode 100644
index 37adf5f69ab56..0000000000000
--- a/OnlineDB/CSCCondDB/interface/SaturationFit.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "Minuit2/VariableMetricMinimizer.h"
-#include "Minuit2/FunctionMinimum.h"
-#include "Minuit2/MnPrint.h"
-
-#include <vector>
-#include <cmath>
-#include "OnlineDB/CSCCondDB/interface/SaturationFcn.h"
-
-class SaturationFit{ 
-
- public:
-
-  SaturationFit(int N,float *charge_ptr,float *adc_ptr, float *u0_ptr, float *u1_ptr, float *u2_ptr, float*u3_ptr){
-   double u[3],sigma[3],chisq;
-   VariableMetricMinimizer* pMinimizer=new VariableMetricMinimizer() ; 
-   SaturationFcn* pFcn=new SaturationFcn();
-   pFcn->set_data(N,charge_ptr,adc_ptr);
-   std::vector<double> par(4,0);
-   std::vector<double> err(4,0);
-   //printf(" about to fill pars \n");
-   par[0]=pFcn->x0start;
-   par[1]=pFcn->x1start;
-   par[2]=pFcn->x2start;
-   par[3]=pFcn->x3start;
-   //printf(" pars: %f %f %f %f \n",par[0],par[1],par[2],par[3]);
-   err[0]=20.0;
-   err[1]=0.0001;
-   err[2]=1.0;
-   err[3]=20.0;
-   FunctionMinimum fmin = pMinimizer->Minimize(*pFcn, par, err, 1, 5000, 0.01);
-   if( !fmin.IsValid()){
-     printf(" minuit did not converge \n");
-   } else {
-     std::cout<<"fit succeeded... results: "<<fmin<<std::endl;
-    chisq = fmin.Fval();
-    u[0]     = fmin.UserParameters().Value( static_cast<unsigned int>(0) );
-    *u0_ptr=u[0];
-    sigma[0] = fmin.UserParameters().Error( static_cast<unsigned int>(0) );
-    u[1]     = fmin.UserParameters().Value( static_cast<unsigned int>(1) );
-    *u1_ptr=u[1];
-    sigma[1] = fmin.UserParameters().Error( static_cast<unsigned int>(1) );
-    u[2]     = fmin.UserParameters().Value( static_cast<unsigned int>(2) );
-    *u2_ptr=u[2];
-    sigma[2] = fmin.UserParameters().Error( static_cast<unsigned int>(2) );
-    u[3]     = fmin.UserParameters().Value( static_cast<unsigned int>(3) );
-    *u3_ptr=u[3];
-    sigma[3] = fmin.UserParameters().Error( static_cast<unsigned int>(3) );
-    //std::cout<<"fitresults: "<<u[0]<<" "<<u[1]<<" "<<u[2]<<" "<<u[3]<<std::endl;
-    
-   }
- }
-
- ~SaturationFit(){}
-
- private:
- 
-}; 
diff --git a/OnlineDB/CSCCondDB/plugins/BuildFile.xml b/OnlineDB/CSCCondDB/plugins/BuildFile.xml
new file mode 100644
index 0000000000000..f9340b27d7e75
--- /dev/null
+++ b/OnlineDB/CSCCondDB/plugins/BuildFile.xml
@@ -0,0 +1,5 @@
+<library file="*.cc" name="OnlineDBCSCCondDBPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="OnlineDB/CSCCondDB"/>
+</library>
diff --git a/OnlineDB/CSCCondDB/src/CSCChamberTimeCorrectionsReadTest.cc b/OnlineDB/CSCCondDB/plugins/CSCChamberTimeCorrectionsReadTest.cc
similarity index 71%
rename from OnlineDB/CSCCondDB/src/CSCChamberTimeCorrectionsReadTest.cc
rename to OnlineDB/CSCCondDB/plugins/CSCChamberTimeCorrectionsReadTest.cc
index 8129b8e13102e..d54e5c256f6e5 100644
--- a/OnlineDB/CSCCondDB/src/CSCChamberTimeCorrectionsReadTest.cc
+++ b/OnlineDB/CSCCondDB/plugins/CSCChamberTimeCorrectionsReadTest.cc
@@ -1,5 +1,23 @@
-#include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h"
-#include <string>
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "OnlineDB/CSCCondDB/interface/CSCCableRead.h"
+
+class CSCChamberTimeCorrectionsReadTest : public edm::EDAnalyzer {
+public:
+  explicit CSCChamberTimeCorrectionsReadTest(const edm::ParameterSet&);
+  ~CSCChamberTimeCorrectionsReadTest() override;
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+};
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(CSCChamberTimeCorrectionsReadTest);
 
 CSCChamberTimeCorrectionsReadTest::CSCChamberTimeCorrectionsReadTest(const edm::ParameterSet &) {}
 CSCChamberTimeCorrectionsReadTest::~CSCChamberTimeCorrectionsReadTest() {}
diff --git a/OnlineDB/CSCCondDB/src/CSCMap1Read.cc b/OnlineDB/CSCCondDB/plugins/CSCMap1Read.cc
similarity index 91%
rename from OnlineDB/CSCCondDB/src/CSCMap1Read.cc
rename to OnlineDB/CSCCondDB/plugins/CSCMap1Read.cc
index 44069a18b18b0..e87f727e60af7 100644
--- a/OnlineDB/CSCCondDB/src/CSCMap1Read.cc
+++ b/OnlineDB/CSCCondDB/plugins/CSCMap1Read.cc
@@ -1,5 +1,27 @@
-#include "OnlineDB/CSCCondDB/interface/CSCMap1Read.h"
-#include <string>
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "OnlineDB/CSCCondDB/interface/CSCMap1.h"
+
+//
+// class declaration
+//
+
+class CSCMap1Read : public edm::EDAnalyzer {
+public:
+  explicit CSCMap1Read(const edm::ParameterSet&);
+  ~CSCMap1Read() override;
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+};
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(CSCMap1Read);
 
 CSCMap1Read::CSCMap1Read(const edm::ParameterSet &) {}
 CSCMap1Read::~CSCMap1Read() {}
diff --git a/OnlineDB/CSCCondDB/src/SealModule.cc b/OnlineDB/CSCCondDB/plugins/plugins.cc
similarity index 70%
rename from OnlineDB/CSCCondDB/src/SealModule.cc
rename to OnlineDB/CSCCondDB/plugins/plugins.cc
index 0b0dad0ea6adf..ad55765785174 100644
--- a/OnlineDB/CSCCondDB/src/SealModule.cc
+++ b/OnlineDB/CSCCondDB/plugins/plugins.cc
@@ -1,15 +1,10 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/SourceFactory.h"
 #include "OnlineDB/CSCCondDB/interface/CSCChamberMapValues.h"
 #include "OnlineDB/CSCCondDB/interface/CSCChamberIndexValues.h"
 #include "OnlineDB/CSCCondDB/interface/CSCCrateMapValues.h"
 #include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsValues.h"
 #include "OnlineDB/CSCCondDB/interface/CSCDDUMapValues.h"
-#include "OnlineDB/CSCCondDB/interface/CSCMap1Read.h"
-#include "OnlineDB/CSCCondDB/interface/CSCChamberTimeCorrectionsReadTest.h"
 
-DEFINE_FWK_MODULE(CSCMap1Read);
-DEFINE_FWK_MODULE(CSCChamberTimeCorrectionsReadTest);
 DEFINE_FWK_EVENTSETUP_SOURCE(CSCChamberMapValues);
 DEFINE_FWK_EVENTSETUP_SOURCE(CSCChamberIndexValues);
 DEFINE_FWK_EVENTSETUP_SOURCE(CSCCrateMapValues);
diff --git a/OnlineDB/CSCCondDB/test/BuildFile.xml b/OnlineDB/CSCCondDB/test/BuildFile.xml
index 873c0fef649b0..7627b2e5ff84a 100644
--- a/OnlineDB/CSCCondDB/test/BuildFile.xml
+++ b/OnlineDB/CSCCondDB/test/BuildFile.xml
@@ -1,7 +1,7 @@
 <use name="CondCore/PopCon"/>
 <use name="CondFormats/CSCObjects"/>
-<use name="OnlineDB/Oracle"/>
+<use name="OnlineDB/CSCCondDB"/>
 <lib name="occi"/>
-<library name="OnlineDBCSCCondDB_TestPlugins" file="../src/CSCMap1.cc,../src/CSCCableRead.cc,stubs/*.cc">
+<library name="OnlineDBCSCCondDB_TestPlugins" file="stubs/*.cc">
   <flags EDM_PLUGIN="1"/>
 </library>