changed ICFGs to a decorator style such that different directions and features can be combined freely