Updates to how we handle hosts.

Also moved solution file to parent folder.