Modify to work with new folder structure
Update to work with new file structure