Some structural changes and build adjustments to link grape lib (in tests) and curl/curlpp