[*] Reorganizing structures and files