Added to wget and cURL, cleaned up organization