diff --git a/codemap/cli/app.py b/codemap/cli/app.py
new file mode 100644
index 0000000..794c341
--- /dev/null
+++ b/codemap/cli/app.py
@@ -0,0 +1,23 @@
+import typer
+from rich.console import Console
+from codemap.cli.analyze import analyze
+from codemap.cli.watch import watch
+from codemap.cli.serve import serve
+
+app = typer.Typer(
+    name="codemap",
+    help="A CLI tool that analyzes codebases and generates interactive architecture diagrams",
+    add_completion=False
+)
+console = Console()
+
+app.command()(analyze)
+app.command()(watch)
+app.command()(serve)
+
+@app.callback()
+def callback():
+    pass
+
+def main():
+    app()