removing extra files AND finish struct