Updates for new file structure.