diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/ElectronMenuConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/ElectronMenuConfig.py
index 571a67d8b6b382bb855656e6a35e7257c1749944..7e325af5d20a93ff46301fb8a2e37974103e177b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/ElectronMenuConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/ElectronMenuConfig.py
@@ -283,7 +283,7 @@ def l2CaloAlgCfg( flags, roisKey="EMCaloRoIs" ):
     return acc, fastCalo
 
 def l2CaloRecoCfg( flags ):
-    from TrigUpgradeTest.MenuComponents import InViewReco
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
 
     reco = InViewReco("FastCaloEMReco")
     algAcc, alg = l2CaloAlgCfg( flags, roisKey = reco.name+'RoIs' )
@@ -299,11 +299,11 @@ def l2ElectronCaloStepCfg( flags, chains ):
 
     # setup algorithms
     #acc.addSequence( seqAND('L2CaloEgamma'), parentName=parentSeq )
-    from TrigUpgradeTest.MenuComponents import NJMenuSequence
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import NJMenuSequence
     fhSeq = NJMenuSequence( 'ElectronFastCalo' )
     fhSeq.addFilter( chains, inKey = 'EMRoIDecisions' ) # out key named after sequence
 
-    from TrigUpgradeTest.MenuComponents import RecoFragmentsPool 
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool
 
     # obtain the reconstruction CF fragment
     fhSeq.addReco( RecoFragmentsPool.retrieve( l2CaloRecoCfg, flags ) )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/PhotonMenuConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/PhotonMenuConfig.py
index 2df10841bf16e230943bb10a90ce7eeeb001224f..ef0546afff8778d3a32ef97617f0a69dbaf978eb 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/PhotonMenuConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/PhotonMenuConfig.py
@@ -7,12 +7,12 @@ from AthenaCommon.Constants import DEBUG,VERBOSE
 
 def l2PhotonCaloStepCfg( flags, chains ):
 
-    from TrigUpgradeTest.MenuComponents import NJMenuSequence
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import NJMenuSequence
     fhSeq = NJMenuSequence( 'PhotonFastCalo' )
     fhSeq.addFilter( chains, inKey = 'EMRoIDecisions' )
 
     from TrigUpgradeTest.ElectronMenuConfig import l2CaloRecoCfg # generator for the L2 Calo EM clustering
-    from TrigUpgradeTest.MenuComponents import RecoFragmentsPool 
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool
 
     # obtain the reconstruction CF fragment    
     fhSeq.addReco( RecoFragmentsPool.retrieve( l2CaloRecoCfg, flags ) )
@@ -46,7 +46,7 @@ def l2PhotonAlgCfg( flags ):
     return acc, photonFex
 
 def l2PhotonRecoCfg( flags ):
-    from TrigUpgradeTest.MenuComponents import InViewReco
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
 
     reco = InViewReco("L2PhotonReco")
     reco.inputMaker().RequireParentView = True
@@ -64,12 +64,12 @@ def l2PhotonRecoCfg( flags ):
     return reco
 
 def l2PhotonRecoStepCfg( flags, chains, inputSequence ):
-    from TrigUpgradeTest.MenuComponents import NJMenuSequence
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import NJMenuSequence
     fhSeq = NJMenuSequence( 'PhotonFastReco' )
     fhSeq.addFilter( chains, inKey=inputSequence.hypoDecisions() )
 
     from TrigUpgradeTest.ElectronMenuConfig import l2CaloRecoCfg # generator for the L2 Calo EM clustering
-    from TrigUpgradeTest.MenuComponents import RecoFragmentsPool 
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool
 
     # obtain the reconstruction CF fragment
     fhSeq.addReco( RecoFragmentsPool.retrieve( l2PhotonRecoCfg, flags ) )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
index d03cf50162373ff856076ffc3dbacab429543d84..bfe52ead09a28ab9697f2c2cb723b0b2d4c02ed8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
@@ -59,7 +59,7 @@ from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig
 acc.merge(TriggerHistSvcConfig(flags ))
 
 def menu( mf ):
-    from TrigUpgradeTest.MenuComponents import HLTMenuAccumulator
+    from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import HLTMenuAccumulator
     menuAcc = HLTMenuAccumulator()
 
     # here menu generation starts