Removed server/client and replaced with binder/connector