removed last old structure files, now time for cleaning ... modified Ambient to sets etc