Updated histo macros, split into multiple files