Update for file structure