diff --git a/setup.py b/setup.py
index 00f43ed..dfbbd32 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,6 @@ setup(
     entry_points='''
         [console_scripts]
         ciclostile=cli:cli
-        ciclostile-web=web:cli
     ''',
 
     install_requires=['Click', 'markdown', 'jinja2', 'flask', 'flask-httpauth']
diff --git a/src/web/__init__.py b/src/ciclostile/web/__init__.py
similarity index 56%
rename from src/web/__init__.py
rename to src/ciclostile/web/__init__.py
index 3caf9ed..bdece6c 100644
--- a/src/web/__init__.py
+++ b/src/ciclostile/web/__init__.py
@@ -9,14 +9,3 @@ app = Flask(__name__)
 app.register_blueprint(api, url_prefix="/api")
 
 app.config['SECRET_KEY'] = 'secret key here'
-
-
-@click.command()
-@click.option("-p", "--port", type=int, default=12345)
-@click.argument("post_dir", default=".")
-def cli(port, post_dir):
-    app.run(port=port)
-
-
-if __name__ == '__main__':
-    cli()
diff --git a/src/web/api.py b/src/ciclostile/web/api.py
similarity index 100%
rename from src/web/api.py
rename to src/ciclostile/web/api.py
diff --git a/src/cli.py b/src/cli.py
index 5f4bb12..6916d9a 100755
--- a/src/cli.py
+++ b/src/cli.py
@@ -3,6 +3,8 @@ import sys
 import click
 import ciclostile
 
+from ciclostile.web import app as webapp
+
 
 @click.group()
 def cli():
@@ -30,5 +32,12 @@ def index(template, output, folder):
     output.write(html)
 
 
+@cli.command()
+@click.option("-p", "--port", type=int, default=12345)
+@click.argument("post_dir", default=".")
+def app(port, post_dir):
+    webapp.run(port=port)
+
+
 if __name__ == "__main__":
     cli()