Move hosts to their own package, cleanup.