[WIP] Feature/restructure ff fluxvars

Merge request reports