diff --git a/swh/graph/cli.py b/swh/graph/cli.py
index 4033969..99c86b5 100644
--- a/swh/graph/cli.py
+++ b/swh/graph/cli.py
@@ -1,122 +1,150 @@
 # Copyright (C) 2019  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+import aiohttp
 import click
 import sys
 
 from swh.core.cli import CONTEXT_SETTINGS, AliasedGroup
 from swh.graph import client
 from swh.graph.pid import PidToIntMap, IntToPidMap
+from swh.graph.server.app import make_app
+from swh.graph.server.backend import Backend
 
 
 @click.group(name='graph', context_settings=CONTEXT_SETTINGS,
              cls=AliasedGroup)
 @click.pass_context
 def cli(ctx):
     """Software Heritage graph tools."""
     ctx.ensure_object(dict)
 
 
 @cli.command('api-client')
 @click.option('--host', default='localhost', help='Graph server host')
 @click.option('--port', default='5009', help='Graph server port')
 @click.pass_context
 def api_client(ctx, host, port):
     """Client for the Software Heritage Graph REST service
 
     """
     url = 'http://{}:{}'.format(host, port)
     app = client.RemoteGraphClient(url)
 
     # TODO: run web app
     print(app.stats())
 
 
 @cli.group('map')
 @click.pass_context
 def map(ctx):
     """Manage swh-graph on-disk maps"""
     pass
 
 
 def dump_pid2int(filename):
     for (pid, int) in PidToIntMap(filename):
         print('{}\t{}'.format(pid, int))
 
 
 def dump_int2pid(filename):
     for (int, pid) in IntToPidMap(filename):
         print('{}\t{}'.format(int, pid))
 
 
 def restore_pid2int(filename):
     """read a textual PID->int map from stdin and write its binary version to
     filename
 
     """
     with open(filename, 'wb') as dst:
         for line in sys.stdin:
             (str_pid, str_int) = line.split()
             PidToIntMap.write_record(dst, str_pid, int(str_int))
 
 
 def restore_int2pid(filename, length):
     """read a textual int->PID map from stdin and write its binary version to
     filename
 
     """
     int2pid = IntToPidMap(filename, mode='wb', length=length)
     for line in sys.stdin:
         (str_int, str_pid) = line.split()
         int2pid[int(str_int)] = str_pid
     int2pid.close()
 
 
 @map.command('dump')
 @click.option('--type', '-t', 'map_type', required=True,
               type=click.Choice(['pid2int', 'int2pid']),
               help='type of map to dump')
 @click.argument('filename', required=True, type=click.Path(exists=True))
 @click.pass_context
 def dump_map(ctx, map_type, filename):
     """dump a binary PID<->int map to textual format"""
     if map_type == 'pid2int':
         dump_pid2int(filename)
     elif map_type == 'int2pid':
         dump_int2pid(filename)
     else:
         raise ValueError('invalid map type: ' + map_type)
     pass
 
 
 @map.command('restore')
 @click.option('--type', '-t', 'map_type', required=True,
               type=click.Choice(['pid2int', 'int2pid']),
               help='type of map to dump')
 @click.option('--length', '-l', type=int,
               help='''map size in number of logical records
               (required for int2pid maps)''')
 @click.argument('filename', required=True, type=click.Path())
 @click.pass_context
 def restore_map(ctx, map_type, length, filename):
     """restore a binary PID<->int map from textual format"""
     if map_type == 'pid2int':
         restore_pid2int(filename)
     elif map_type == 'int2pid':
         if length is None:
             raise click.UsageError(
                 'map length is required when restoring {} maps'.format(
                     map_type), ctx)
         restore_int2pid(filename, length)
     else:
         raise ValueError('invalid map type: ' + map_type)
 
 
+@cli.group('graph')
+@click.pass_context
+def graph(ctx):
+    """Manage swh-graph on-disk maps"""
+    pass
+
+
+@graph.command(name='rpc-serve')
+@click.option('--host', default='0.0.0.0',
+              metavar='IP', show_default=True,
+              help="Host ip address to bind the server on")
+@click.option('--port', default=5002, type=click.INT,
+              metavar='PORT', show_default=True,
+              help="Binding port of the server")
+@click.option('--graph', required=True, metavar='GRAPH',
+              help="Path prefix of the graph to load")
+@click.pass_context
+def serve(ctx, host, port, graph):
+    backend = Backend(graph_path=graph)
+    app = make_app(backend=backend)
+
+    with backend:
+        aiohttp.web.run_app(app, host=host, port=port)
+
+
 def main():
     return cli(auto_envvar_prefix='SWH_GRAPH')
 
 
 if __name__ == '__main__':
     main()
diff --git a/swh/graph/server/__main__.py b/swh/graph/server/__main__.py
deleted file mode 100755
index c49edad..0000000
--- a/swh/graph/server/__main__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2019  The Software Heritage developers
-# See the AUTHORS file at the top-level directory of this distribution
-# License: GNU General Public License version 3, or any later version
-# See top-level LICENSE file for more information
-
-
-import argparse
-import aiohttp.web
-
-from swh.graph.server.app import make_app
-from swh.graph.server.backend import Backend
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--host', default='0.0.0.0')
-    parser.add_argument('--port', type=int, default=5009)
-    parser.add_argument('--graph', required=True)
-    args = parser.parse_args()
-
-    backend = Backend(graph_path=args.graph)
-    app = make_app(backend=backend)
-
-    with backend:
-        aiohttp.web.run_app(app, host=args.host, port=args.port)
-
-
-if __name__ == '__main__':
-    main()