restructuring and renaming all "dependency" into "relation". A lot of lines !