Fix filename with space
Better handling with subdirectories