Moved HostFactory to own namespaces