Moved the client and servers to their own supervisor