Modifying for new file structure