diff --git a/cli/click_cli.py b/cli/click_cli.py
index 3c7a7732..662097ce 100755
--- a/cli/click_cli.py
+++ b/cli/click_cli.py
@@ -7,7 +7,8 @@ Separate entry point for Click-based commands (not parser/handler architecture)
 import sys
 from pathlib import Path
 
-# Add /opt/aitbc/cli to Python path for commands and utils
+# Add /opt/aitbc and /opt/aitbc/cli to Python path for shared modules
+sys.path.insert(0, str(Path("/opt/aitbc")))
 sys.path.insert(0, str(Path("/opt/aitbc/cli")))
 
 import click
diff --git a/cli/commands/config.py b/cli/commands/config.py
index 76497443..430d9f85 100755
--- a/cli/commands/config.py
+++ b/cli/commands/config.py
@@ -8,7 +8,7 @@ import yaml
 import json
 from pathlib import Path
 from typing import Optional, Dict, Any
-from config import get_config, Config
+from aitbc_cli.config import get_config, CLIConfig
 from utils import output, error, success