Update with the new file structure