updated file structure and contents