changing dep to forked ones instead. And adding client & server dir