diff --git a/pyproject.toml b/pyproject.toml
index c24b5cb1..e35139b0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -103,7 +103,7 @@ import_mode = "append"
 
 [project]
 name = "aitbc-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "AITBC Command Line Interface Tools"
 authors = [
     {name = "AITBC Team", email = "team@aitbc.net"}
@@ -149,6 +149,7 @@ classifiers = [
 ]
 
 [project.optional-dependencies]
+[dependency-groups]
 dev = [
     "pytest==9.0.2",
     "pytest-asyncio>=1.3.0,<2.0.0",
@@ -166,7 +167,7 @@ dev = [
 ]
 
 [project.scripts]
-aitbc = "aitbc_cli.main:cli"
+aitbc = "core.main:main"
 
 [project.urls]
 Homepage = "https://aitbc.net"
@@ -178,14 +179,5 @@ requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
-where = ["cli", "apps/coordinator-api"]
-include = ["aitbc_cli*", "aitbc*"]
-
-[tool.setuptools.package-dir]
-"aitbc_cli" = "cli/aitbc_cli"
-"aitbc" = "apps/coordinator-api/aitbc"
-
-[dependency-groups]
-dev = [
-    "mypy (>=1.19.1,<2.0.0)"
-]
+where = ["cli"]
+include = ["core*", "commands*", "auth*", "utils*", "models*", "config*", "completion*"]