diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/TrigSecVtxFinder/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigAlgorithms/TrigSecVtxFinder/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigSecVtxFinder/TrigSecVtxFinder/ATLAS_CHECK_THREAD_SAFETY
rename to Trigger/TrigAlgorithms/TrigSecVtxFinder/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigSecVtxFinder/CMakeLists.txt
index 5867a46d9553dcfa7d93223af91c0ed8d151c2b5..9857e4598fb64b48169c15e7e6b8030b1e8e6e6a 100644
--- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigSecVtxFinder/CMakeLists.txt
@@ -1,35 +1,13 @@
-################################################################################
-# Package: TrigSecVtxFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigSecVtxFinder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Trigger/TrigSteer/TrigInterfaces
-                          Trigger/TrigTools/TrigInDetVxInJetTool
-                          Trigger/TrigTools/TrigTimeAlgs
-                          Trigger/TrigTools/TrigInDetToolInterfaces
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          PRIVATE
-                          Control/CxxUtils
-                          DetectorDescription/GeoPrimitives
-                          Trigger/TrigEvent/TrigInDetEvent
-                          Trigger/TrigEvent/TrigSteeringEvent )
-
-# External dependencies:
-find_package( Eigen )
-
 # Component(s) in the package:
 atlas_add_component( TrigSecVtxFinder
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel TrigInterfacesLib TrigTimeAlgsLib GeoPrimitives TrigInDetEvent TrigSteeringEvent )
+                     LINK_LIBRARIES BeamSpotConditionsData CxxUtils GaudiKernel GeoPrimitives TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigSteeringEvent TrigTimeAlgsLib )
 
 # Install files from the package:
-atlas_install_headers( TrigSecVtxFinder )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/packagedoc.h b/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/packagedoc.h
deleted file mode 100644
index 207c8db9afa72a816416d24638ee009670340696..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/doc/packagedoc.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@page TrigSecVtxFinder_page TrigSecVtxFinder package
-
-@author Xinlu Huang
-
-
-*/
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx
index 46f1046692fc10109fbb69d9191f8b2dc8d924ee..901f2869229d91c2f3e364d88d841fcb0bbf4d36 100644
--- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigSecVtxFinder/TrigSecVtxFinder.h"
+#include "TrigSecVtxFinder.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/TrigSecVtxFinder/TrigSecVtxFinder.h b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.h
old mode 100755
new mode 100644
similarity index 94%
rename from Trigger/TrigAlgorithms/TrigSecVtxFinder/TrigSecVtxFinder/TrigSecVtxFinder.h
rename to Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.h
index f44a76b60d2aa4fb2b95d7ce9904ef2d8035abdf..690818ce0da6a1b2fda6872521a74ff51b06e836
--- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/TrigSecVtxFinder/TrigSecVtxFinder.h
+++ b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/TrigSecVtxFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // ************************************************
@@ -20,7 +20,7 @@
 #include "TrigInterfaces/FexAlgo.h"
 
 #include "TrigInDetToolInterfaces/ITrigTrackJetFinderTool.h"
-#include "TrigInDetVxInJetTool/ITrigInDetVxInJetTool.h"
+#include "TrigInDetToolInterfaces/ITrigInDetVxInJetTool.h"
 #include "BeamSpotConditionsData/BeamSpotData.h"
 
 #include "CxxUtils/checker_macros.h"
diff --git a/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/components/TrigSecVtxFinder_entries.cxx b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/components/TrigSecVtxFinder_entries.cxx
index b16aa92f642b9f7df2949cb7b86df1dbbacdef70..5784170c6fb3dd9ab49b46c131893006e77b48e9 100644
--- a/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/components/TrigSecVtxFinder_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigSecVtxFinder/src/components/TrigSecVtxFinder_entries.cxx
@@ -1,3 +1,3 @@
-#include "TrigSecVtxFinder/TrigSecVtxFinder.h"
+#include "../TrigSecVtxFinder.h"
 
 DECLARE_COMPONENT( TrigSecVtxFinder )
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/ITrigInDetVxInJetTool.h b/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigInDetVxInJetTool.h
similarity index 88%
rename from Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/ITrigInDetVxInJetTool.h
rename to Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigInDetVxInJetTool.h
index 6d9ae1cd74aa2ea08b504e45fea5a7d0c959da43..e6f7fa08df9730ff6f4ffd57a47137fc71cba3fc 100755
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/ITrigInDetVxInJetTool.h
+++ b/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigInDetVxInJetTool.h
@@ -1,11 +1,10 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // **************************************************
 //
 // NAME:     ITrigInDetVxInJetTool.h
-// PACKAGE:  Trigger/TrigTools/TrigTrackJetFinderTool
 //
 // AUTHOR:   Andrea Coccaro
 // MAIL:     Andrea.Coccaro AT cern.ch
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigTools/TrigInDetVxInJetTool/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/ATLAS_CHECK_THREAD_SAFETY
rename to Trigger/TrigTools/TrigInDetVxInJetTool/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/CMakeLists.txt b/Trigger/TrigTools/TrigInDetVxInJetTool/CMakeLists.txt
index cb0bbf99b1183d7b51b4d97110edf3a64fdc0582..0a7d573ac343ac94f1fc7f11dceac4f06ace45d0 100644
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/CMakeLists.txt
@@ -1,33 +1,14 @@
-################################################################################
-# Package: TrigInDetVxInJetTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigInDetVxInJetTool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          GaudiKernel
-                          Trigger/TrigTools/TrigVKalFitter
-                          PRIVATE
-                          PhysicsAnalysis/AnalysisCommon/AnalysisUtils
-                          Tracking/TrkEvent/VxVertex
-                          Trigger/TrigEvent/TrigInDetEvent
-                          Trigger/TrigSteer/TrigInterfaces )
-
 # External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core MathCore Hist )
 
 # Component(s) in the package:
 atlas_add_component( TrigInDetVxInJetTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrigVKalFitterLib AnalysisUtilsLib VxVertex TrigInDetEvent TrigInterfacesLib )
-
-# Install files from the package:
-atlas_install_headers( TrigInDetVxInJetTool )
-
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AnalysisUtilsLib AthenaBaseComps GaudiKernel GeoPrimitives TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigVKalFitterLib VxVertex )
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/src/CutTrk.cxx b/Trigger/TrigTools/TrigInDetVxInJetTool/src/CutTrk.cxx
index 58155c1ff04cd24b94acdef2bbf31c830b7aa8e8..677ae61f76d164e4ed21cd9e53a5d282daa9ca6a 100755
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/src/CutTrk.cxx
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/CutTrk.cxx
@@ -3,7 +3,7 @@
 */
 
 // Header include
-#include "TrigInDetVxInJetTool/TrigInDetVxInJetTool.h"
+#include "TrigInDetVxInJetTool.h"
 #include "TrigInDetEvent/TrigInDetTrack.h"
 #include "AnalysisUtils/AnalysisMisc.h"
 #include <iostream>
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx
index 56178078fae67763634fe9e626c824ca1c9f75ee..b1481edb802afab9204280f71574bf5fc7f20971 100755
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "VxVertex/RecVertex.h"
-#include "TrigInDetVxInJetTool/TrigInDetVxInJetTool.h"
+#include "TrigInDetVxInJetTool.h"
 #include "TrigInDetEvent/TrigInDetTrack.h"
 #include "TrigInDetEvent/TrigVertex.h"
 #include "TMath.h"
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/TrigInDetVxInJetTool.h b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.h
old mode 100755
new mode 100644
similarity index 98%
rename from Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/TrigInDetVxInJetTool.h
rename to Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.h
index f4917a77e5a2043cb5d3827ad43f91b1fa538dad..e52908ea088ee618dfa1bd70cfc75eebbb71dec4
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/TrigInDetVxInJetTool/TrigInDetVxInJetTool.h
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigInDetVxInJetTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -28,7 +28,7 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
 
-#include "TrigInDetVxInJetTool/ITrigInDetVxInJetTool.h"
+#include "TrigInDetToolInterfaces/ITrigInDetVxInJetTool.h"
 
 #include "TrigVKalFitter/TrigVKalFitter.h"
 
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigVrtSec.cxx b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigVrtSec.cxx
index 3a0ea1e44eb6e1cdad2a52c2ccebfc454042b402..b822833f7911172c8c92cf0c92362b7e53a1ea52 100755
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigVrtSec.cxx
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/TrigVrtSec.cxx
@@ -3,7 +3,7 @@
 */
 
 // Header include
-#include "TrigInDetVxInJetTool/TrigInDetVxInJetTool.h"
+#include "TrigInDetVxInJetTool.h"
 //-------------------------------------------------
 // Other stuff
 #include  "AnalysisUtils/AnalysisMisc.h"
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/src/Utilities.cxx b/Trigger/TrigTools/TrigInDetVxInJetTool/src/Utilities.cxx
index 3848ff85e1ed677a5a8d6ed2e89e43f9b0f89fa3..1477503e7b31bca0c319330256579ef284dca6d9 100755
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/src/Utilities.cxx
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/Utilities.cxx
@@ -3,7 +3,7 @@
 */
 
 // Header include
-#include "TrigInDetVxInJetTool/TrigInDetVxInJetTool.h"
+#include "TrigInDetVxInJetTool.h"
 #include "VxVertex/RecVertex.h"
 #include "TrigInDetEvent/TrigInDetTrack.h"
 //-------------------------------------------------
diff --git a/Trigger/TrigTools/TrigInDetVxInJetTool/src/components/TrigInDetVxInJetTool_entries.cxx b/Trigger/TrigTools/TrigInDetVxInJetTool/src/components/TrigInDetVxInJetTool_entries.cxx
index 52d765efae1bd12294637091ccf41ad09ec22497..a6161be2529c3f2be866ef0666dca718f73f9b72 100644
--- a/Trigger/TrigTools/TrigInDetVxInJetTool/src/components/TrigInDetVxInJetTool_entries.cxx
+++ b/Trigger/TrigTools/TrigInDetVxInJetTool/src/components/TrigInDetVxInJetTool_entries.cxx
@@ -1,3 +1,3 @@
-#include "TrigInDetVxInJetTool/TrigInDetVxInJetTool.h"
+#include "../TrigInDetVxInJetTool.h"
 
 DECLARE_COMPONENT( TrigInDetVxInJetTool )
diff --git a/Trigger/TrigTools/TrigVKalFitter/CMakeLists.txt b/Trigger/TrigTools/TrigVKalFitter/CMakeLists.txt
index 45d9f6522c98ac11f41f7b895d464ef6f27f67cb..d7e35e04144d2ae47395092134947acea4f0e672 100644
--- a/Trigger/TrigTools/TrigVKalFitter/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigVKalFitter/CMakeLists.txt
@@ -1,36 +1,20 @@
-################################################################################
-# Package: TrigVKalFitter
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigVKalFitter )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          GaudiKernel
-                          MagneticField/MagFieldInterfaces
-                          Tracking/TrkVertexFitter/TrkVKalVrtCore
-                          PRIVATE
-                          Trigger/TrigEvent/TrigInDetEvent )
-
 # External dependencies:
 find_package( CLHEP )
-find_package( Eigen )
 
 # Component(s) in the package:
 atlas_add_library( TrigVKalFitterLib
                    src/*.cxx
                    PUBLIC_HEADERS TrigVKalFitter
-                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives EventPrimitives GaudiKernel MagFieldInterfaces TrkVKalVrtCore
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps EventPrimitives GaudiKernel GeoPrimitives MagFieldInterfaces TrkVKalVrtCore
                    PRIVATE_LINK_LIBRARIES TrigInDetEvent )
 
 atlas_add_component( TrigVKalFitter
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives EventPrimitives GaudiKernel MagFieldInterfaces TrkVKalVrtCore TrigInDetEvent TrigVKalFitterLib )
-
+                     LINK_LIBRARIES TrigVKalFitterLib )