mv fcts from ToDomain to where they are actually used, and related cleanup

Merge request reports

Loading