shotop: cleaning up file names and directory structure