[MRG] Improve structure + introduction