Addressing items from Guilherme's review. Note I left the BuildVersion in the service, as I see it belonging there. Arguably, there should be 2, one for client and one for service, but service version is the most important that I can see.