Added client and renamed server