Merged; added client dir