diff --git a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py
index be01b91bf9392..60a142b9fbe4e 100644
--- a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py
+++ b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py
@@ -11,7 +11,7 @@
 from DQM.DTMonitorClient.dtDQMOfflineClients_cff import *
 from DQM.RPCMonitorClient.RPCTier0Client_cff import *
 from DQM.CSCMonitorModule.csc_dqm_offlineclient_collisions_cff import *
-from DQMOffline.Muon.gem_dqm_offline_client_cff import *
+from DQM.GEM.gem_dqm_offline_client_cff import *
 from DQMServices.Components.DQMFEDIntegrityClient_cff import *
 
 DQMNone = cms.Sequence()
@@ -36,13 +36,13 @@
 
 DQMOfflineHeavyIons_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )
 
-DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence( 
+DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence(
 						      DQMOfflineHeavyIons_SecondStepEcal *
                                                       DQMOfflineHeavyIons_SecondStepTrackerStrip *
                                                       DQMOfflineHeavyIons_SecondStepTrackerPixel *
                                                       DQMOfflineHeavyIons_SecondStepHcal *
                                                       DQMOfflineHeavyIons_SecondStepMuonDPG *
-                                                      DQMOfflineHeavyIons_SecondStepFED 
+                                                      DQMOfflineHeavyIons_SecondStepFED
 							)
 
 DQMOfflineHeavyIons_SecondStepDPG = cms.Sequence(
@@ -67,7 +67,7 @@
 
 DQMOfflineHeavyIons_SecondStepTracking = cms.Sequence( hiTrackingDqmClientHeavyIons )
 
-DQMOfflineHeavyIons_SecondStep_PrePOG = cms.Sequence( DQMOfflineHeavyIons_SecondStepMUO * 
+DQMOfflineHeavyIons_SecondStep_PrePOG = cms.Sequence( DQMOfflineHeavyIons_SecondStepMUO *
                                                       DQMOfflineHeavyIons_SecondStepEGamma *
                                                       DQMOfflineHeavyIons_SecondStepTrigger *
                                                       DQMOfflineHeavyIons_SecondStepBeam *
diff --git a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
index 75de40d2cd6f9..8489bf96324fb 100644
--- a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
+++ b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
@@ -13,7 +13,7 @@
 from DQM.DTMonitorModule.dtDQMOfflineSources_HI_cff import *
 from DQM.RPCMonitorClient.RPCTier0Source_cff import *
 from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
-from DQMOffline.Muon.gem_dqm_offline_source_cff import *
+from DQM.GEM.gem_dqm_offline_source_cff import *
 from DQM.BeamMonitor.AlcaBeamMonitorHeavyIons_cff import *
 
 DQMNone = cms.Sequence()
@@ -56,12 +56,12 @@
 
 #Modifications
 from DQMOffline.Muon.muonMonitors_cff import *
-diMuonHistos.etaBin = cms.int32(70) #dimuonhistograms mass, bin   
-diMuonHistos.etaBBin = cms.int32(70)    
-diMuonHistos.etaEBin = cms.int32(70)    
-diMuonHistos.LowMassMin = cms.double(2.0)   
-diMuonHistos.LowMassMax = cms.double(14.0)    
-diMuonHistos.HighMassMin = cms.double(55.0)   
+diMuonHistos.etaBin = cms.int32(70) #dimuonhistograms mass, bin
+diMuonHistos.etaBBin = cms.int32(70)
+diMuonHistos.etaEBin = cms.int32(70)
+diMuonHistos.LowMassMin = cms.double(2.0)
+diMuonHistos.LowMassMax = cms.double(14.0)
+diMuonHistos.HighMassMin = cms.double(55.0)
 diMuonHistos.HighMassMax = cms.double(125.0)
 
 from DQMOffline.Trigger.DQMOffline_Trigger_cff import *
@@ -138,7 +138,7 @@
 DQMOfflineHeavyIonsPrePOG = cms.Sequence( DQMOfflineHeavyIonsMUO *
                                            DQMOfflineHeavyIonsTracking *
                                            DQMOfflineHeavyIonsJetMET *
-                                           DQMOfflineHeavyIonsEGamma * 
+                                           DQMOfflineHeavyIonsEGamma *
                                            DQMOfflineHeavyIonsTrigger *
                                            DQMOfflineHeavyIonsVertex *
                                            DQMOfflineHeavyIonsBeam *