Move HostSwitcher to sperate package