By separating Server it allows Peers to directly embed the server and provide customizations and hooks into rest of the services. Change-Id: Ic1d68740fd494d2f82c1739bd990849c561b912b