updated structure and files