Put CLI and REST client into separate modules