diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt
index 5cb0f8c8234e50fd1fb13b55867e546fea34d102..f89fa511b94ba0301b32cc2b33763016a1c17130 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt
@@ -1,25 +1,19 @@
-################################################################################
-# Package: TrigOnlineMonitor
-################################################################################
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigOnlineMonitor )
 
 # External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-find_package( tdaq-common )
-find_package( Boost )
+find_package( ROOT COMPONENTS Core Hist )
+find_package( tdaq-common COMPONENTS eformat )
 
 # Component(s) in the package:
 atlas_add_component( TrigOnlineMonitor
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps ByteStreamData ByteStreamData_test GaudiKernel AthenaInterprocess AthenaKernel ByteStreamCnvSvcBaseLib EventInfo MagFieldInterfaces TrigConfL1Data TrigSteeringEvent TrigMonitorBaseLib TrigSteeringLib L1TopoConfig L1TopoRDO TrigT1Interfaces TrigT1Result TrigT1ResultByteStreamLib TrigConfData)
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaInterprocess AthenaKernel AthenaMonitoringKernelLib ByteStreamCnvSvcBaseLib ByteStreamData EventInfo GaudiKernel LumiBlockData MagFieldInterfaces StoreGateLib TrigConfData TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigSteeringEvent TrigT1Interfaces TrigT1Result )
 
 # Install files from the package:
-atlas_install_headers( TrigOnlineMonitor )
 atlas_install_joboptions( share/*.py )
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_scripts( share/plotL1TopoROBMonHist.py )
-
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/share/plotL1TopoROBMonHist.py b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/share/plotL1TopoROBMonHist.py
deleted file mode 100755
index d3d5367123c2b119c407326054c3cce124d1fa8c..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/share/plotL1TopoROBMonHist.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/env python
-import sys
-try:
-    rootFile=sys.argv[1]
-except IndexError:
-    rootFile="expert-monitoring.root"
-print "Reading from %s" % rootFile
-
-import ROOT
-ROOT.gROOT.SetBatch(True)
-ROOT.gROOT.SetStyle("Plain")
-ROOT.gStyle.SetOptStat(111111)
-canv=ROOT.TCanvas("canv","canv", 800, 500)
-pdfFile='L1TopoROBMonitorHist.pdf'
-canv.Print(pdfFile+'[')
-
-tfile = ROOT.TFile(rootFile)
-tdir=tfile.GetDirectory('L1TopoROBMonitor')
-keys=[key for key in tdir.GetListOfKeys()]
-for k in keys:
-    hist=k.ReadObj()
-    canv.Clear()
-    canv.SetName(hist.GetName())
-    canv.SetTitle(hist.GetTitle())
-    if 'payload size' in canv.GetName():
-        canv.SetLogy(1)
-    else:
-        canv.SetLogy(0)
-    hist.Draw()
-    canv.Update()
-    canv.Print(pdfFile)
-canv.Print(pdfFile+']')
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx
index fe51fe2f90609e7e28dc42f6a196dfc21ff24cbc..41413db14fe619bdc71d09a81709237189751cc0 100755
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigOnlineMonitor/TrigMuCTPiROBMonitor.h"
+#include "TrigMuCTPiROBMonitor.h"
 #include "TrigT1Result/RoIBResult.h"
 #include "TrigT1Result/MuCTPI_RDO.h"
 #include "TrigT1Result/MuCTPI_MultiplicityWord_Decoder.h"
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/TrigOnlineMonitor/TrigMuCTPiROBMonitor.h b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.h
old mode 100755
new mode 100644
similarity index 100%
rename from HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/TrigOnlineMonitor/TrigMuCTPiROBMonitor.h
rename to HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigMuCTPiROBMonitor.h
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx
index 8c529f4b1d0a22ac605cb142a83bdb943c10e4d4..0a788bf19ef02dc365dc74182fdaf3f99865fd8c 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigOpMonitor.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigOpMonitor.h"
@@ -20,8 +20,6 @@
 #include <fstream>
 #include <list>
 
-#include <boost/algorithm/string.hpp>
-
 // Helpers
 namespace {
   /// Sanitize COOL folder names
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx
index 6d8e576154034638960745f01ec2145e962b2efa..88239255d2e173ce7a34d84dfdbe2f12743aa4e4 100755
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigOnlineMonitor/TrigROBMonitor.h"
+#include "TrigROBMonitor.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaKernel/Timeout.h"
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/TrigOnlineMonitor/TrigROBMonitor.h b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.h
old mode 100755
new mode 100644
similarity index 100%
rename from HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/TrigOnlineMonitor/TrigROBMonitor.h
rename to HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/TrigROBMonitor.h
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
index 44582e6c879898ff34ab592fdf76c61dd4d57775..b7b64ef2147483ee3e4982221d83df61fea54b87 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
@@ -1,8 +1,8 @@
-#include "TrigOnlineMonitor/TrigROBMonitor.h"
-#include "TrigOnlineMonitor/TrigMuCTPiROBMonitor.h"
-#include "src/TrigALFAROBMonitor.h"
-#include "src/TrigL1TopoWriteValData.h"
-#include "src/TrigOpMonitor.h"
+#include "../TrigROBMonitor.h"
+#include "../TrigMuCTPiROBMonitor.h"
+#include "../TrigALFAROBMonitor.h"
+#include "../TrigL1TopoWriteValData.h"
+#include "../TrigOpMonitor.h"
 
 DECLARE_COMPONENT( TrigROBMonitor )
 DECLARE_COMPONENT( TrigMuCTPiROBMonitor )