Added client and server folders