Add server and cli bin commands