update to match recent file structure changes