diff --git a/Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h b/Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h
index 1c209b298ca3c..fee11abfbd940 100644
--- a/Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h
+++ b/Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h
@@ -2,7 +2,7 @@
 #define Fireworks_Calo_FWCaloHistDataProxyBuilder_h
 
 #include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
-#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
 
 class TH2F;
 class FWHistSliceSelector;
diff --git a/Fireworks/Calo/interface/FWECALDetailViewBase.h b/Fireworks/Calo/interface/FWECALDetailViewBase.h
index 2b6600c56c629..36e894cfc81b9 100644
--- a/Fireworks/Calo/interface/FWECALDetailViewBase.h
+++ b/Fireworks/Calo/interface/FWECALDetailViewBase.h
@@ -28,6 +28,6 @@ class FWECALDetailViewBase : public FWDetailViewGL<T> {
   void setTextInfo(const FWModelId &id, const T *) override;
 };
 
-#include "Fireworks/Calo/src/FWECALDetailViewBase.icc"
+#include "Fireworks/Calo/interface/FWECALDetailViewBase.icc"
 
 #endif
diff --git a/Fireworks/Calo/src/FWECALDetailViewBase.icc b/Fireworks/Calo/interface/FWECALDetailViewBase.icc
similarity index 100%
rename from Fireworks/Calo/src/FWECALDetailViewBase.icc
rename to Fireworks/Calo/interface/FWECALDetailViewBase.icc
diff --git a/Fireworks/Calo/src/FWFromSliceSelector.h b/Fireworks/Calo/interface/FWFromSliceSelector.h
similarity index 100%
rename from Fireworks/Calo/src/FWFromSliceSelector.h
rename to Fireworks/Calo/interface/FWFromSliceSelector.h
diff --git a/Fireworks/Calo/src/FWFromTEveCaloDataSelector.h b/Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h
similarity index 96%
rename from Fireworks/Calo/src/FWFromTEveCaloDataSelector.h
rename to Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h
index 734cd8e8200c0..fdd75159d8941 100644
--- a/Fireworks/Calo/src/FWFromTEveCaloDataSelector.h
+++ b/Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h
@@ -23,7 +23,7 @@
 
 // user include files
 #include "Fireworks/Core/interface/FWFromEveSelectorBase.h"
-#include "Fireworks/Calo/src/FWFromSliceSelector.h"
+#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
 
 // forward declarations
 class FWEventItem;
diff --git a/Fireworks/Calo/interface/FWHistSliceSelector.h b/Fireworks/Calo/interface/FWHistSliceSelector.h
index fda3544aaf7fb..c346053002167 100644
--- a/Fireworks/Calo/interface/FWHistSliceSelector.h
+++ b/Fireworks/Calo/interface/FWHistSliceSelector.h
@@ -1,7 +1,7 @@
 #ifndef Fireworks_Calo_FWHistSliceSelector_h
 #define Fireworks_Calo_FWHistSliceSelector_h
 
-#include "Fireworks/Calo/src/FWFromSliceSelector.h"
+#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
 class TH2F;
 
 class FWHistSliceSelector : public FWFromSliceSelector {
diff --git a/Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.h b/Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.h
index 2ef006a44c028..233cff8e5b89a 100644
--- a/Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.h
+++ b/Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.h
@@ -22,7 +22,7 @@
 #include <string>
 
 #include "Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h"
-#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
 #include "DataFormats/CaloTowers/interface/CaloTower.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
 
diff --git a/Fireworks/Calo/plugins/FWHFTowerProxyBuilder.h b/Fireworks/Calo/plugins/FWHFTowerProxyBuilder.h
index 1f89d4153a11e..dd808f6bb3984 100644
--- a/Fireworks/Calo/plugins/FWHFTowerProxyBuilder.h
+++ b/Fireworks/Calo/plugins/FWHFTowerProxyBuilder.h
@@ -22,7 +22,7 @@
 
 // user include files
 #include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
-#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
 #include "DataFormats/HcalRecHit/interface/HFRecHit.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 
diff --git a/Fireworks/Calo/plugins/FWHFTowerSliceSelector.h b/Fireworks/Calo/plugins/FWHFTowerSliceSelector.h
index f971bd2f3b94b..d5d010239452c 100644
--- a/Fireworks/Calo/plugins/FWHFTowerSliceSelector.h
+++ b/Fireworks/Calo/plugins/FWHFTowerSliceSelector.h
@@ -24,7 +24,7 @@
 class HcalDetId;
 class TEveCaloDataVec;
 
-#include "Fireworks/Calo/src/FWFromSliceSelector.h"
+#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
 
 // forward declarations
 
diff --git a/Fireworks/Calo/plugins/FWHGTowerProxyBuilder.h b/Fireworks/Calo/plugins/FWHGTowerProxyBuilder.h
index 60f764f70e975..fd1e8ab47d26d 100644
--- a/Fireworks/Calo/plugins/FWHGTowerProxyBuilder.h
+++ b/Fireworks/Calo/plugins/FWHGTowerProxyBuilder.h
@@ -22,7 +22,7 @@
 
 // user include files
 #include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
-#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
 // #include "DataFormats/HGCRecHit/interface/HGRecHit.h"
 #include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"
 
diff --git a/Fireworks/Calo/plugins/FWHGTowerSliceSelector.h b/Fireworks/Calo/plugins/FWHGTowerSliceSelector.h
index e5d4418da2fc8..74c8b314887cc 100644
--- a/Fireworks/Calo/plugins/FWHGTowerSliceSelector.h
+++ b/Fireworks/Calo/plugins/FWHGTowerSliceSelector.h
@@ -24,7 +24,7 @@
 class DetId;
 class TEveCaloDataVec;
 
-#include "Fireworks/Calo/src/FWFromSliceSelector.h"
+#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
 
 // forward declarations
 
diff --git a/Fireworks/Calo/src/FWCaloDataProxyBuilderBase.cc b/Fireworks/Calo/src/FWCaloDataProxyBuilderBase.cc
index 84f00c0f967bd..40f3943eb37e0 100644
--- a/Fireworks/Calo/src/FWCaloDataProxyBuilderBase.cc
+++ b/Fireworks/Calo/src/FWCaloDataProxyBuilderBase.cc
@@ -25,7 +25,7 @@
 #include "Fireworks/Core/interface/FWEventItem.h"
 
 #include "Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h"
-#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
 
 #include "DataFormats/CaloTowers/interface/CaloTower.h"
 
diff --git a/Fireworks/Calo/src/FWFromSliceSelector.cc b/Fireworks/Calo/src/FWFromSliceSelector.cc
index 2cef90802459a..17d6aa43eb8a8 100644
--- a/Fireworks/Calo/src/FWFromSliceSelector.cc
+++ b/Fireworks/Calo/src/FWFromSliceSelector.cc
@@ -13,7 +13,7 @@
 // system include files
 
 // user include files
-#include "Fireworks/Calo/src/FWFromSliceSelector.h"
+#include "Fireworks/Calo/interface/FWFromSliceSelector.h"
 #include "Fireworks/Core/interface/FWEventItem.h"
 
 //
diff --git a/Fireworks/Calo/src/FWFromTEveCaloDataSelector.cc b/Fireworks/Calo/src/FWFromTEveCaloDataSelector.cc
index 671a8368a64d9..c6d86198119c9 100644
--- a/Fireworks/Calo/src/FWFromTEveCaloDataSelector.cc
+++ b/Fireworks/Calo/src/FWFromTEveCaloDataSelector.cc
@@ -16,7 +16,7 @@
 #include <functional>
 
 // user include files
-#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+#include "Fireworks/Calo/interface/FWFromTEveCaloDataSelector.h"
 #include "Fireworks/Core/interface/FWModelChangeManager.h"
 #include "Fireworks/Core/interface/FWEventItem.h"
 
diff --git a/Fireworks/Core/interface/CmsShowTaskExecutor.h b/Fireworks/Core/interface/CmsShowTaskExecutor.h
index bf1de8c87a39f..27e54b79faa56 100644
--- a/Fireworks/Core/interface/CmsShowTaskExecutor.h
+++ b/Fireworks/Core/interface/CmsShowTaskExecutor.h
@@ -23,7 +23,7 @@
 #include <functional>
 
 // user include files
-#include "Fireworks/Core/src/CmsShowTaskExecutorBase.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutorBase.h"
 
 // forward declarations
 
diff --git a/Fireworks/Core/src/CmsShowTaskExecutorBase.h b/Fireworks/Core/interface/CmsShowTaskExecutorBase.h
similarity index 100%
rename from Fireworks/Core/src/CmsShowTaskExecutorBase.h
rename to Fireworks/Core/interface/CmsShowTaskExecutorBase.h
diff --git a/Fireworks/Core/interface/FWDetailViewCanvas.h b/Fireworks/Core/interface/FWDetailViewCanvas.h
index e396137f7ef9e..5d0b5f66c0b18 100644
--- a/Fireworks/Core/interface/FWDetailViewCanvas.h
+++ b/Fireworks/Core/interface/FWDetailViewCanvas.h
@@ -21,5 +21,5 @@ class FWDetailViewCanvas : public FWDetailView<T> {
   TCanvas* m_viewCanvas;
 };
 
-#include "Fireworks/Core/src/FWDetailViewCanvas.icc"
+#include "Fireworks/Core/interface/FWDetailViewCanvas.icc"
 #endif
diff --git a/Fireworks/Core/src/FWDetailViewCanvas.icc b/Fireworks/Core/interface/FWDetailViewCanvas.icc
similarity index 100%
rename from Fireworks/Core/src/FWDetailViewCanvas.icc
rename to Fireworks/Core/interface/FWDetailViewCanvas.icc
diff --git a/Fireworks/Core/interface/FWDetailViewGL.h b/Fireworks/Core/interface/FWDetailViewGL.h
index 6896d5f80f5c7..c51cd08dd98a9 100644
--- a/Fireworks/Core/interface/FWDetailViewGL.h
+++ b/Fireworks/Core/interface/FWDetailViewGL.h
@@ -29,6 +29,6 @@ class FWDetailViewGL : public FWDetailView<T> {
   TEveScene *m_eveScene;
 };
 
-#include "Fireworks/Core/src/FWDetailViewGL.icc"
+#include "Fireworks/Core/interface/FWDetailViewGL.icc"
 
 #endif
diff --git a/Fireworks/Core/src/FWDetailViewGL.icc b/Fireworks/Core/interface/FWDetailViewGL.icc
similarity index 100%
rename from Fireworks/Core/src/FWDetailViewGL.icc
rename to Fireworks/Core/interface/FWDetailViewGL.icc
diff --git a/Fireworks/Core/interface/FWHLTValidator.h b/Fireworks/Core/interface/FWHLTValidator.h
index e82a9df129702..07804593594e7 100644
--- a/Fireworks/Core/interface/FWHLTValidator.h
+++ b/Fireworks/Core/interface/FWHLTValidator.h
@@ -6,7 +6,7 @@
 // Class  :     FWHLTValidator
 //
 
-#include "Fireworks/Core/src/FWValidatorBase.h"
+#include "Fireworks/Core/interface/FWValidatorBase.h"
 
 namespace edm {
   class TriggerNames;
diff --git a/Fireworks/Core/interface/FWItemAccessorRegistry.h b/Fireworks/Core/interface/FWItemAccessorRegistry.h
index efdbf34938f4b..37be3f5100c91 100644
--- a/Fireworks/Core/interface/FWItemAccessorRegistry.h
+++ b/Fireworks/Core/interface/FWItemAccessorRegistry.h
@@ -5,7 +5,7 @@
 // Package:     Core
 // Class  :     FWItemAccessorRegistry
 //
-/**\class FWItemAccessorRegistry FWItemAccessorRegistry.h Fireworks/Core/src/FWItemAccessorRegistry.h
+/**\class FWItemAccessorRegistry FWItemAccessorRegistry.h Fireworks/Core/interface/FWItemAccessorRegistry.h
 
    Description: Registry for all th FWItemAccessorBase derived classes that can be loaded via the
                 plugin manager. Those classes are to be used to have specialized versions of
diff --git a/Fireworks/Core/interface/FWTEventList.h b/Fireworks/Core/interface/FWTEventList.h
index da4ce1cec4b8d..432e768bcbb56 100644
--- a/Fireworks/Core/interface/FWTEventList.h
+++ b/Fireworks/Core/interface/FWTEventList.h
@@ -2,7 +2,7 @@
 #define Fireworks_Core_FWTEventList_h
 
 // There was a bug in ROOT ... fixed on Dec 9 2009:
-//   http://root.cern.ch/viewcvs/trunk/tree/tree/src/TEventList.cxx?view=log
+//   http://root.cern.ch/viewcvs/trunk/tree/tree/interface/TEventList.cxx?view=log
 //
 // We need to keep this intermediate class until we switch to
 // root-5.26 or later.
diff --git a/Fireworks/Core/src/FWValidatorBase.h b/Fireworks/Core/interface/FWValidatorBase.h
similarity index 100%
rename from Fireworks/Core/src/FWValidatorBase.h
rename to Fireworks/Core/interface/FWValidatorBase.h
diff --git a/Fireworks/Core/interface/FWXMLConfigParser.h b/Fireworks/Core/interface/FWXMLConfigParser.h
index befebb5e2f10d..d265a399091bc 100644
--- a/Fireworks/Core/interface/FWXMLConfigParser.h
+++ b/Fireworks/Core/interface/FWXMLConfigParser.h
@@ -2,7 +2,7 @@
 #define Fireworks_Core_FWXMLConfigParser
 #include <istream>
 #include <iostream>
-#include "Fireworks/Core/src/SimpleSAXParser.h"
+#include "Fireworks/Core/interface/SimpleSAXParser.h"
 
 #include "Fireworks/Core/interface/FWConfiguration.h"
 
diff --git a/Fireworks/Core/src/SimpleSAXParser.h b/Fireworks/Core/interface/SimpleSAXParser.h
similarity index 100%
rename from Fireworks/Core/src/SimpleSAXParser.h
rename to Fireworks/Core/interface/SimpleSAXParser.h
diff --git a/Fireworks/Core/src/CmsShowMainBase.cc b/Fireworks/Core/src/CmsShowMainBase.cc
index 42f88fe97da45..0e430b14d5b87 100644
--- a/Fireworks/Core/src/CmsShowMainBase.cc
+++ b/Fireworks/Core/src/CmsShowMainBase.cc
@@ -41,7 +41,7 @@
 #include "Fireworks/Core/interface/FWViewManagerManager.h"
 #include "Fireworks/Core/interface/CmsShowTaskExecutor.h"
 #include "Fireworks/Core/src/FWColorSelect.h"
-#include "Fireworks/Core/src/SimpleSAXParser.h"
+#include "Fireworks/Core/interface/SimpleSAXParser.h"
 #include "Fireworks/Core/interface/CmsShowCommon.h"
 #include "Fireworks/Core/interface/fwLog.h"
 #include "Fireworks/Core/interface/fwPaths.h"
diff --git a/Fireworks/Core/src/CmsShowTaskExecutorBase.cc b/Fireworks/Core/src/CmsShowTaskExecutorBase.cc
index 0aa49a8c1d583..193a5d2654b49 100644
--- a/Fireworks/Core/src/CmsShowTaskExecutorBase.cc
+++ b/Fireworks/Core/src/CmsShowTaskExecutorBase.cc
@@ -15,7 +15,7 @@
 #include <TTimer.h>
 
 // user include files
-#include "Fireworks/Core/src/CmsShowTaskExecutorBase.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutorBase.h"
 #include "Fireworks/Core/src/CmsShowTaskTimer.h"
 
 //
diff --git a/Fireworks/Core/src/CmsShowTaskTimer.cc b/Fireworks/Core/src/CmsShowTaskTimer.cc
index a664ab16e995a..7cc58497b2f3b 100644
--- a/Fireworks/Core/src/CmsShowTaskTimer.cc
+++ b/Fireworks/Core/src/CmsShowTaskTimer.cc
@@ -14,7 +14,7 @@
 
 // user include files
 #include "Fireworks/Core/src/CmsShowTaskTimer.h"
-#include "Fireworks/Core/src/CmsShowTaskExecutorBase.h"
+#include "Fireworks/Core/interface/CmsShowTaskExecutorBase.h"
 
 //
 // constants, enums and typedefs
diff --git a/Fireworks/Core/src/FWConfigurationManager.cc b/Fireworks/Core/src/FWConfigurationManager.cc
index 2d7ad9fb6c84c..84419b634c208 100644
--- a/Fireworks/Core/src/FWConfigurationManager.cc
+++ b/Fireworks/Core/src/FWConfigurationManager.cc
@@ -24,7 +24,7 @@
 #include "Fireworks/Core/interface/FWConfiguration.h"
 #include "Fireworks/Core/interface/FWConfigurable.h"
 #include "Fireworks/Core/interface/fwLog.h"
-#include "Fireworks/Core/src/SimpleSAXParser.h"
+#include "Fireworks/Core/interface/SimpleSAXParser.h"
 #include "Fireworks/Core/interface/FWJobMetadataManager.h"
 #include "Fireworks/Core/interface/fwLog.h"
 #include "Fireworks/Core/interface/FWXMLConfigParser.h"
diff --git a/Fireworks/Core/src/FWExpressionValidator.h b/Fireworks/Core/src/FWExpressionValidator.h
index 061fda44955b7..c5100d45156bb 100644
--- a/Fireworks/Core/src/FWExpressionValidator.h
+++ b/Fireworks/Core/src/FWExpressionValidator.h
@@ -24,7 +24,7 @@
 #include "FWCore/Reflection/interface/TypeWithDict.h"
 
 // user include files
-#include "Fireworks/Core/src/FWValidatorBase.h"
+#include "Fireworks/Core/interface/FWValidatorBase.h"
 
 // forward declarations
 namespace fireworks {
diff --git a/Fireworks/Core/src/FWGeometryTableView.cc b/Fireworks/Core/src/FWGeometryTableView.cc
index da3efb88b6e17..0d4f9cf1e82cd 100644
--- a/Fireworks/Core/src/FWGeometryTableView.cc
+++ b/Fireworks/Core/src/FWGeometryTableView.cc
@@ -27,7 +27,7 @@
 
 #include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
 #include "Fireworks/Core/interface/FWGUIManager.h"
-#include "Fireworks/Core/src/FWValidatorBase.h"
+#include "Fireworks/Core/interface/FWValidatorBase.h"
 #include "Fireworks/Core/src/FWEveDetectorGeo.h"
 
 #include "KeySymbols.h"
diff --git a/Fireworks/Core/src/FWOverlapTableView.cc b/Fireworks/Core/src/FWOverlapTableView.cc
index 6495366a3283c..ba85b65fb732a 100644
--- a/Fireworks/Core/src/FWOverlapTableView.cc
+++ b/Fireworks/Core/src/FWOverlapTableView.cc
@@ -24,7 +24,7 @@
 #include "Fireworks/Core/interface/fwLog.h"
 
 #include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
-#include "Fireworks/Core/src/FWValidatorBase.h"
+#include "Fireworks/Core/interface/FWValidatorBase.h"
 #include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
 
 #include "TEveScene.h"
diff --git a/Fireworks/Core/src/FWPartialConfig.cc b/Fireworks/Core/src/FWPartialConfig.cc
index 94a4ce7e22a86..aeb0fff0ee700 100644
--- a/Fireworks/Core/src/FWPartialConfig.cc
+++ b/Fireworks/Core/src/FWPartialConfig.cc
@@ -8,7 +8,7 @@
 #include "TSystem.h"
 #include "TROOT.h"
 
-#include "Fireworks/Core/src/SimpleSAXParser.h"
+#include "Fireworks/Core/interface/SimpleSAXParser.h"
 #include "Fireworks/Core/interface/FWXMLConfigParser.h"
 #include "Fireworks/Core/interface/FWEventItemsManager.h"
 #include "Fireworks/Core/interface/FWGUIManager.h"
diff --git a/Fireworks/Core/src/SimpleSAXParser.cc b/Fireworks/Core/src/SimpleSAXParser.cc
index f9608ff89bda9..6ba1997a76ef4 100644
--- a/Fireworks/Core/src/SimpleSAXParser.cc
+++ b/Fireworks/Core/src/SimpleSAXParser.cc
@@ -1,4 +1,4 @@
-#include "Fireworks/Core/src/SimpleSAXParser.h"
+#include "Fireworks/Core/interface/SimpleSAXParser.h"
 
 /** Helper function to handle entities, i.e. characters specified with
     the "&label;" syntax.