<DA-353> fix spaces
<DA-353> rename folder
<DA-353> fix delegate bindings