[*] FO : Move header modules to new hook, first part 1/2