Update to reflect new file structure