Fix dir and filename