Modified file names and folder structure.