Refactor HostConnectors

:red_circle: WIP :red_circle: