diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index b8e9e51b..6cce3953 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -11,6 +11,6 @@ replace = version="{new_version}"
 search = version = release = "{current_version}"
 replace = version = release = "{new_version}"
 
-[bumpversion:file:src/datapilot/__init__.py]
+[bumpversion:file:src/datapilot/cli/__init__.py]
 search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
diff --git a/.gitignore b/.gitignore
index 77973dd9..23bb0a16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ docs/_build
 
 # Mypy Cache
 .mypy_cache/
+.aider*
diff --git a/setup.py b/setup.py
index be8a6f10..e8d25d7c 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 import re
 from pathlib import Path
 
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 from setuptools import setup
 
 
@@ -23,8 +23,9 @@ def read(*names, **kwargs):
     author="Altimate Inc",
     author_email="info@altimate.ai",
     url="https://github.com/AltimateAI/datapilot-cli",
-    packages=find_packages("src"),
+    packages=find_namespace_packages(where="src"),  # Use find_namespace_packages
     package_dir={"": "src"},
+    namespace_packages=["datapilot"],
     py_modules=[path.stem for path in Path("src").glob("*.py")],
     include_package_data=True,
     zip_safe=False,
diff --git a/src/datapilot/__init__.py b/src/datapilot/__init__.py
deleted file mode 100644
index 6561790f..00000000
--- a/src/datapilot/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "0.0.15"
diff --git a/src/datapilot/cli/__init__.py b/src/datapilot/cli/__init__.py
index e69de29b..6561790f 100644
--- a/src/datapilot/cli/__init__.py
+++ b/src/datapilot/cli/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.0.15"
diff --git a/src/datapilot/cli/main.py b/src/datapilot/cli/main.py
index 9e0cfb39..49bb504e 100644
--- a/src/datapilot/cli/main.py
+++ b/src/datapilot/cli/main.py
@@ -9,3 +9,10 @@ def datapilot():
 
 
 datapilot.add_command(dbt)
+
+try:
+    from datapilot.ingestion.cli import ingest
+
+    datapilot.add_command(ingest)
+except ImportError:
+    pass