Move some stuff around
Move some stuff; ssh completion