updated file structure and files