modified file names and folder structure