more refactoring, added in ssh path