Bdes-decision_flows adaption to the restructure.
Merge remote-tracking branch 'origin/restructure' into restructure