diff --git a/analyzers/dataframe/CMakeLists.txt b/analyzers/dataframe/CMakeLists.txt
index 8864248d9d..5695a9d0be 100644
--- a/analyzers/dataframe/CMakeLists.txt
+++ b/analyzers/dataframe/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-find_package(ROOT REQUIRED COMPONENTS ROOTDataFrame ROOTVecOps TMVA)
+find_package(ROOT REQUIRED COMPONENTS ROOTDataFrame ROOTVecOps)
 include(${ROOT_USE_FILE})
 #include("${ROOT_DIR}/modules/RootNewMacros.cmake")
 
@@ -25,7 +25,7 @@ message(STATUS "includes-------------------------- dataframe fastjet: ${FASTJET_
 
 
 file(GLOB sources src/*.cc)
-file(GLOB headers include/FCCAnalyses/*.h)
+file(GLOB headers RELATIVE ${CMAKE_CURRENT_LIST_DIR} FCCAnalyses/*.h)
 
 message(STATUS "includes headers ${headers}")
 message(STATUS "includes sources ${sources}")
@@ -40,11 +40,10 @@ endif()
 message(STATUS "CMAKE_CURRENT_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "CMAKE_INSTALL_INCLUDEDIR  ${CMAKE_INSTALL_INCLUDEDIR}")
 
-add_library(FCCAnalyses SHARED ${sources} ${headers} )
+add_library(FCCAnalyses SHARED  ${sources} ${headers} )
 target_include_directories(FCCAnalyses  PUBLIC
-                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-                           ${FCCEDM_INCLUDE_DIRS}
+                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                           $<INSTALL_INTERFACE:include>
                            ${FASTJET_INCLUDE_DIR}
                            ${acts_INCLUDE_DIR}
                            ${AWKWARD_INCLUDE}
@@ -55,7 +54,6 @@ target_link_libraries(FCCAnalyses
                       ROOT::MathCore
                       ROOT::ROOTVecOps
                       ROOT::ROOTDataFrame
-                      ROOT::TMVA
                       EDM4HEP::edm4hep
                       EDM4HEP::edm4hepDict
                       podio::podio
@@ -81,7 +79,7 @@ set_target_properties(FCCAnalyses PROPERTIES
 ROOT_GENERATE_DICTIONARY(G__FCCAnalyses
                          ${headers}
                          MODULE FCCAnalyses
-                         LINKDEF include/FCCAnalyses/LinkDef.h
+                         LINKDEF FCCAnalyses/LinkDef.h
                          )
 
 install(TARGETS FCCAnalyses
diff --git a/analyzers/dataframe/include/FCCAnalyses/Algorithms.h b/analyzers/dataframe/FCCAnalyses/Algorithms.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/Algorithms.h
rename to analyzers/dataframe/FCCAnalyses/Algorithms.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/CaloNtupleizer.h b/analyzers/dataframe/FCCAnalyses/CaloNtupleizer.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/CaloNtupleizer.h
rename to analyzers/dataframe/FCCAnalyses/CaloNtupleizer.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/ExternalRecombiner.h b/analyzers/dataframe/FCCAnalyses/ExternalRecombiner.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/ExternalRecombiner.h
rename to analyzers/dataframe/FCCAnalyses/ExternalRecombiner.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/JetClustering.h b/analyzers/dataframe/FCCAnalyses/JetClustering.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/JetClustering.h
rename to analyzers/dataframe/FCCAnalyses/JetClustering.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/JetClusteringUtils.h b/analyzers/dataframe/FCCAnalyses/JetClusteringUtils.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/JetClusteringUtils.h
rename to analyzers/dataframe/FCCAnalyses/JetClusteringUtils.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/JetTaggingUtils.h b/analyzers/dataframe/FCCAnalyses/JetTaggingUtils.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/JetTaggingUtils.h
rename to analyzers/dataframe/FCCAnalyses/JetTaggingUtils.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/LinkDef.h b/analyzers/dataframe/FCCAnalyses/LinkDef.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/LinkDef.h
rename to analyzers/dataframe/FCCAnalyses/LinkDef.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/MCParticle.h b/analyzers/dataframe/FCCAnalyses/MCParticle.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/MCParticle.h
rename to analyzers/dataframe/FCCAnalyses/MCParticle.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/ReconstructedParticle.h b/analyzers/dataframe/FCCAnalyses/ReconstructedParticle.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/ReconstructedParticle.h
rename to analyzers/dataframe/FCCAnalyses/ReconstructedParticle.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/ReconstructedParticle2MC.h b/analyzers/dataframe/FCCAnalyses/ReconstructedParticle2MC.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/ReconstructedParticle2MC.h
rename to analyzers/dataframe/FCCAnalyses/ReconstructedParticle2MC.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/ReconstructedParticle2Track.h b/analyzers/dataframe/FCCAnalyses/ReconstructedParticle2Track.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/ReconstructedParticle2Track.h
rename to analyzers/dataframe/FCCAnalyses/ReconstructedParticle2Track.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/Smearing.h b/analyzers/dataframe/FCCAnalyses/Smearing.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/Smearing.h
rename to analyzers/dataframe/FCCAnalyses/Smearing.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/Utils.h b/analyzers/dataframe/FCCAnalyses/Utils.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/Utils.h
rename to analyzers/dataframe/FCCAnalyses/Utils.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/ValenciaPlugin.h b/analyzers/dataframe/FCCAnalyses/ValenciaPlugin.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/ValenciaPlugin.h
rename to analyzers/dataframe/FCCAnalyses/ValenciaPlugin.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/VertexFinderActs.h b/analyzers/dataframe/FCCAnalyses/VertexFinderActs.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/VertexFinderActs.h
rename to analyzers/dataframe/FCCAnalyses/VertexFinderActs.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/VertexFitterActs.h b/analyzers/dataframe/FCCAnalyses/VertexFitterActs.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/VertexFitterActs.h
rename to analyzers/dataframe/FCCAnalyses/VertexFitterActs.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/VertexFitterSimple.h b/analyzers/dataframe/FCCAnalyses/VertexFitterSimple.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/VertexFitterSimple.h
rename to analyzers/dataframe/FCCAnalyses/VertexFitterSimple.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/VertexingUtils.h b/analyzers/dataframe/FCCAnalyses/VertexingUtils.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/VertexingUtils.h
rename to analyzers/dataframe/FCCAnalyses/VertexingUtils.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/dummyLoader.h b/analyzers/dataframe/FCCAnalyses/dummyLoader.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/dummyLoader.h
rename to analyzers/dataframe/FCCAnalyses/dummyLoader.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/myFinalSel.h b/analyzers/dataframe/FCCAnalyses/myFinalSel.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/myFinalSel.h
rename to analyzers/dataframe/FCCAnalyses/myFinalSel.h
diff --git a/analyzers/dataframe/include/FCCAnalyses/myUtils.h b/analyzers/dataframe/FCCAnalyses/myUtils.h
similarity index 100%
rename from analyzers/dataframe/include/FCCAnalyses/myUtils.h
rename to analyzers/dataframe/FCCAnalyses/myUtils.h