diff --git a/cli/click_cli.py b/cli/click_cli.py
index a083e3c4..3c7a7732 100755
--- a/cli/click_cli.py
+++ b/cli/click_cli.py
@@ -7,8 +7,8 @@ Separate entry point for Click-based commands (not parser/handler architecture)
 import sys
 from pathlib import Path
 
-# Add /opt/aitbc to Python path for shared modules
-sys.path.insert(0, str(Path("/opt/aitbc")))
+# Add /opt/aitbc/cli to Python path for commands and utils
+sys.path.insert(0, str(Path("/opt/aitbc/cli")))
 
 import click
 
diff --git a/cli/commands/ai.py b/cli/commands/ai.py
index 81215216..8a1f86b9 100644
--- a/cli/commands/ai.py
+++ b/cli/commands/ai.py
@@ -2,13 +2,13 @@ import os
 import subprocess
 import sys
 import uuid
+from utils import output, error, success, warning
 import click
 import httpx
-from pydantic import BaseModel
 
 @click.group(name='ai')
 def ai_group():
-    """AI marketplace commands."""
+    """AI marketplace commands for AITBC CLI"""
     pass
 
 @ai_group.command()
diff --git a/cli/commands/arbitrage.py b/cli/commands/arbitrage.py
index db8eb100..c453a008 100644
--- a/cli/commands/arbitrage.py
+++ b/cli/commands/arbitrage.py
@@ -1,7 +1,7 @@
-"""Arbitrage commands for AITBC CLI"""
+"""Arbitrage trading commands for AITBC CLI"""
 
 import click
-import json
+import httpx
 from utils import output, error, success, warning
 
 
diff --git a/cli/commands/compliance.py b/cli/commands/compliance.py
index 87c1db1c..c94c8c8a 100755
--- a/cli/commands/compliance.py
+++ b/cli/commands/compliance.py
@@ -15,7 +15,7 @@ from utils.kyc_aml_providers import submit_kyc_verification, check_kyc_status, p
 
 @click.group()
 def compliance():
-    """Compliance and regulatory management commands"""
+    """Compliance and regulatory management commands for AITBC CLI"""
     pass
 
 @compliance.command()
diff --git a/cli/commands/cross_chain.py b/cli/commands/cross_chain.py
index f6066b22..2a5aa4f2 100755
--- a/cli/commands/cross_chain.py
+++ b/cli/commands/cross_chain.py
@@ -4,7 +4,7 @@ import click
 import httpx
 import json
 from typing import Optional
-from config import get_config
+from .config import get_config
 from utils import success, error, output
 
 
diff --git a/cli/commands/database.py b/cli/commands/database.py
index d5312d25..9b79316c 100644
--- a/cli/commands/database.py
+++ b/cli/commands/database.py
@@ -1,7 +1,6 @@
-"""Database commands for AITBC CLI"""
+"""Database service commands for AITBC CLI"""
 
 import click
-import json
 from utils import output, error, success, warning
 
 
diff --git a/cli/commands/edge.py b/cli/commands/edge.py
index 021b5b6a..f70ebebc 100644
--- a/cli/commands/edge.py
+++ b/cli/commands/edge.py
@@ -1,7 +1,6 @@
 """Edge computing commands for AITBC CLI"""
 
 import click
-import json
 from utils import output, error, success, warning
 
 
diff --git a/cli/commands/governance.py b/cli/commands/governance.py
index 9214757b..1a7a1313 100755
--- a/cli/commands/governance.py
+++ b/cli/commands/governance.py
@@ -1,14 +1,12 @@
-"""Governance commands for AITBC CLI"""
+"""Governance proposals and voting commands for AITBC CLI"""
 
 import click
-import httpx
-import json
+from utils import output, error, success, warning
 import os
 import time
 from pathlib import Path
 from typing import Optional
 from datetime import datetime, timedelta
-from utils import output, error, success
 
 
 GOVERNANCE_DIR = Path.home() / ".aitbc" / "governance"
diff --git a/cli/commands/ipfs.py b/cli/commands/ipfs.py
index 3817afc5..7f81d009 100644
--- a/cli/commands/ipfs.py
+++ b/cli/commands/ipfs.py
@@ -1,10 +1,10 @@
 """IPFS storage and retrieval commands for AITBC CLI"""
 
 import click
-import json
+from .config import get_config
+from utils import output, error, success, warning
 from pathlib import Path
 from typing import Optional
-from utils import output, error, success, warning
 
 @click.group()
 def ipfs():
diff --git a/cli/commands/island.py b/cli/commands/island.py
index 6935b98e..0673e906 100644
--- a/cli/commands/island.py
+++ b/cli/commands/island.py
@@ -1,7 +1,6 @@
-"""Island commands for AITBC CLI"""
+"""Island computing commands for AITBC CLI"""
 
 import click
-import json
 from utils import output, error, success, warning
 
 
diff --git a/cli/commands/monitor.py b/cli/commands/monitor.py
index 8ac4d107..84497a01 100755
--- a/cli/commands/monitor.py
+++ b/cli/commands/monitor.py
@@ -1,13 +1,11 @@
-"""Monitoring and dashboard commands for AITBC CLI"""
+"""Monitoring, metrics, and alerting commands for AITBC CLI"""
 
 import click
-import httpx
-import json
+from utils import output, error, success, console
 import time
 from pathlib import Path
 from typing import Optional
 from datetime import datetime, timedelta
-from utils import output, error, success, console
 
 
 @click.group()
diff --git a/cli/commands/plugin.py b/cli/commands/plugin.py
index 7af0f271..20a9430b 100644
--- a/cli/commands/plugin.py
+++ b/cli/commands/plugin.py
@@ -1,7 +1,6 @@
-"""Plugin commands for AITBC CLI"""
+"""Plugin marketplace commands for AITBC CLI"""
 
 import click
-import json
 from utils import output, error, success, warning
 
 
diff --git a/cli/commands/staking.py b/cli/commands/staking.py
index f4b7e34e..107d2f42 100644
--- a/cli/commands/staking.py
+++ b/cli/commands/staking.py
@@ -1,7 +1,6 @@
-"""Staking commands for AITBC CLI"""
+"""Staking and validator management commands for AITBC CLI"""
 
 import click
-import json
 from utils import output, error, success, warning
 
 
diff --git a/cli/commands/swarm.py b/cli/commands/swarm.py
index 4580d0ef..83521ae5 100755
--- a/cli/commands/swarm.py
+++ b/cli/commands/swarm.py
@@ -1,10 +1,8 @@
-"""Swarm intelligence commands for AITBC CLI"""
+"""Swarm intelligence and collective optimization commands for AITBC CLI"""
 
 import click
-import httpx
-import json
-from typing import Optional, Dict, Any, List
 from utils import output, error, success, warning
+from typing import Optional, Dict, Any, List
 
 
 @click.group()
diff --git a/cli/commands/validator.py b/cli/commands/validator.py
index 8d9a59bd..a4df667a 100644
--- a/cli/commands/validator.py
+++ b/cli/commands/validator.py
@@ -1,7 +1,6 @@
-"""Validator commands for AITBC CLI"""
+"""Staking validator management commands for AITBC CLI"""
 
 import click
-import json
 from utils import output, error, success, warning