updated file structure