Clean up file names and folders