move Ntuple definition into a dedicated header file
Merge remote-tracking branch 'origin/CleanUp' into CleanUp