fixing folder and file name issues