Final structure + fixes - e-mail coming with changes