Updated host.
Moving things to more logical places.