Fix ssh completions, re-org